summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only postgres does case sensitive comparesproject-path-case-sensitivityDouwe Maan2015-10-221-1/+1
|
* Fix Gitlab::Database#mysql?Douwe Maan2015-10-221-1/+1
|
* Don't load entire spec with MySQLDouwe Maan2015-10-211-8/+10
|
* Disable case sensitive spec for MySQL.Douwe Maan2015-10-211-0/+3
|
* Move case sensitivity check to find_with_namespace.Douwe Maan2015-10-212-11/+4
|
* Prefer project with exact path to differently cased one when both exist.Douwe Maan2015-10-203-13/+38
|
* Merge branch 'remove-duplicate-repos-in-github-import' into 'master' Douwe Maan2015-10-203-5/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate repositories in GitHub import page By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523 See merge request !1644
| * Fix duplicate repositories in GitHub import pageStan Hu2015-10-193-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
* | Merge pull request #9749 from Bufallo/fix-redis-checkreproduce-500-for-3092Stan Hu2015-10-191-1/+1
|\ \ | |/ |/| Fix regex in redis version check
| * Fix regex in redis version checkBenny Schimmer2015-10-191-1/+1
|/
* Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-194-16/+23
|\
| * Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1960-180/+577
| |\ | | | | | | | | | [ci skip]
| * | Add changelog itemgrzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-181-0/+1
| | |
| * | Sentences end in periods.Douwe Maan2015-10-181-2/+2
| | |
| * | Add tooltip.Douwe Maan2015-10-181-1/+1
| | |
| * | Find correct group membership.Douwe Maan2015-10-182-8/+6
| | |
| * | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-18333-2233/+4832
| |\ \
| * | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-122-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications button was unavailable if user wasn't member of the project, even if protected project is available via group privileges. Showing disabled button with explanation tool-tip is less confusing. This closes #2846.
* | | | Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into ↵Robert Speicher2015-10-1911-0/+122
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
| * \ \ \ Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1960-180/+577
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | [ci skip]
| * | | | Satisfy Rubocopjrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-181-7/+6
| | | | |
| * | | | Add changelog itemDouwe Maan2015-10-181-0/+1
| | | | |
| * | | | Add help text to admin settings notification email.Douwe Maan2015-10-181-0/+2
| | | | |
| * | | | Validate admin notification email.Douwe Maan2015-10-181-0/+4
| | | | |
| * | | | Fix spec.Douwe Maan2015-10-181-33/+53
| | | | |
| * | | | Only pass abuse report ID to AbuseReportMailer.Douwe Maan2015-10-182-6/+11
| | | | |
| * | | | Add HTML abuse report notification email.Douwe Maan2015-10-181-0/+11
| | | | |
| * | | | Tweak email body.Douwe Maan2015-10-181-3/+3
| | | | |
| * | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-18492-4234/+7771
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-088-1/+81
| | | | |
* | | | | Merge branch 'merge-request-widget' into 'master' Dmitriy Zaporozhets2015-10-191-37/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing commit status for widget when no CI service is enabled Fix for #3082 /cc @dzaporozhets See merge request !1621
| * | | | | Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
| | | | | |
* | | | | | Merge branch 'index-milestone-title-label' into 'master' Robert Speicher2015-10-196-48/+77
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance when filtering on milestone on labels Also some minor refactoring in the seeding. See merge request !1587
| * | | | | Rename confusing methodsDouwe Maan2015-10-191-4/+4
| | | | | |
| * | | | | Fix schemazj/gitlab-ce-index-milestone-title-labelDouwe Maan2015-10-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'master' into zj/gitlab-ce-index-milestone-title-labelDouwe Maan2015-10-1874-559/+1058
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Improve performance of filtering issues by milestoneDouwe Maan2015-10-161-30/+33
| | | | | |
| * | | | | Improve performance of queriesZeger-Jan van de Weg2015-10-163-34/+47
| | | | | | | | | | | | | | | | | | | | | | | | Credits to Douwe Maan
| * | | | | Add project scope to milestone searchZeger-Jan van de Weg2015-10-161-1/+8
| | | | | |
| * | | | | Minor refactoring in seedingZeger-Jan van de Weg2015-10-164-5/+5
| | | | | |
| * | | | | Add an index to milestones title and label titleZeger-Jan van de Weg2015-10-162-0/+8
| | | | | |
* | | | | | Merge branch 'notify-footer' into 'master' Robert Speicher2015-10-191-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore notification footer text See merge request !1640
| * | | | | | Restore notification footer text.notify-footerDouwe Maan2015-10-181-0/+4
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-10-191-1/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-code-leading-indent' into 'master' Dmitriy Zaporozhets2015-10-191-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some padding from code blocks This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else. ![Screen_Shot_2015-10-14_at_2.40.38_PM](https://gitlab.com/pioto/gitlab-ce/uploads/5434eb077c17e56528a94079afe3c732/Screen_Shot_2015-10-14_at_2.40.38_PM.png) See merge request !1596
| | * | | | | | | Remove some padding from code blocks Mike Kelly2015-10-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.
* | | | | | | | | Merge branch 'add-files-optionto-changelog'Dmitriy Zaporozhets2015-10-192-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add changelog itemadd-files-optionto-changelogDouwe Maan2015-10-192-0/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-197-39/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
| * | | | | | | | | Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-167-39/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status