summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added extra index for faster enumeration of CI buildsadd-missing-migrationsKamil Trzcinski2015-10-202-1/+7
|
* Add missing migrationsKamil Trzcinski2015-10-203-1/+11
|
* Merge branch 'reference-filter-replace-text-nodes-performance' into 'master' Dmitriy Zaporozhets2015-10-203-4/+46
|\ | | | | | | | | | | | | Speed up searching for text references a bit See merge request !1648
| * Added benchmark for ReferenceFilterreference-filter-replace-text-nodes-performanceYorick Peterse2015-10-201-0/+41
| |
| * Speed up searching for text references a bitYorick Peterse2015-10-202-4/+5
| | | | | | | | | | | | | | | | | | | | If a node is ignored there's no need for searching for a given pattern. In turn, when searching for the pattern there's no need to construct a MatchData object as we only care about presence (or lack thereof), not the resulting matches. In terms of performance this cuts down about 200 ms when loading issue #2164 locally, though this varies a bit depending on system load.
* | Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-209-19/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
| * | Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-209-19/+38
| | |
* | | Merge branch 'handle-no-http-referer' into 'master' Dmitriy Zaporozhets2015-10-2020-43/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to a default path if HTTP_REFERER is not set Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731 See merge request !1646
| * | | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-2020-43/+133
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* | | Merge branch 'rs-8-1-update-guide-changes' into 'master'Robert Speicher2015-10-201-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 8.0-to-8.1 update guide - User needs to update gitlab-git-http-server - User needs to update Nginx configuration [ci skip] See merge request !1625
* | | Merge pull request #9750 from Bufallo/simplify-patch-updatesStan Hu2015-10-201-3/+1
|\ \ \ | | | | | | | | Simplify patch version updates (less steps)
| * | | Simplify patch version updates (less steps)Benny Schimmer2015-10-201-3/+1
| | | |
* | | | Merge pull request #9732 from MauriceMohlek/patch-1Stan Hu2015-10-201-0/+4
|\ \ \ \ | |_|/ / |/| | | Update CHANGELOG
| * | | Fix orderMaurice Mohlek2015-10-201-4/+4
| | | |
| * | | Update CHANGELOGMaurice Mohlek2015-10-201-0/+4
| |/ /
* | | 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
| | | | | |
View Lorry Controller Status