summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* force disable prometheus_metrics untilpawel/disable_prometheus_metricsPawel Chojnacki2017-11-221-3/+3
* Merge branch '40377-blank-states' into 'master'Annabel Dunstone Gray2017-11-215-27/+46
|\
| * Fix blank states using old css40377-blank-statesFilipa Lacerda2017-11-215-27/+46
* | Merge branch 'dz-improve-help-page' into 'master'Annabel Dunstone Gray2017-11-212-21/+1
|\ \
| * | Remove unnecessary css for .documentation-indexdz-improve-help-pageDmitriy Zaporozhets2017-11-211-12/+0
| * | Add wiki css to help pageDmitriy Zaporozhets2017-11-202-9/+1
* | | Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-212-1/+18
|\ \ \
| * | | Revert "check for `read_only?` first before seeing if request is disallowed"digitalMoksha2017-11-211-1/+1
| * | | check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
| * | | use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_he...digitalMoksha2017-11-212-1/+7
| * | | Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-202-0/+11
* | | | Merge branch 'skip_confirmation_user_API' into 'master'Rémy Coutable2017-11-215-1/+22
|\ \ \ \
| * | | | Skip confirmation user apiDaniel Juarez2017-11-215-1/+22
|/ / / /
* | | | Merge branch 'docs-custom-issue-tracker' into 'master'Sean McGivern2017-11-212-0/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Custom issue trackerVictor Wu2017-11-212-0/+21
|/ / /
* | | Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-re...Sean McGivern2017-11-216-3/+66
|\ \ \
| * | | add `#with_metadata` scope to remove a N+1 from the notes' APImicael.bergeron2017-11-212-2/+3
| * | | add the missing specmicael.bergeron2017-11-202-2/+33
| * | | fix the linting error39461-notes-api-for-issues-no-longer-returns-label-additions-removalsmicael.bergeron2017-11-161-1/+1
| * | | reverting to the simpler approachmicael.bergeron2017-11-165-25/+28
| * | | try to fix the failing spec on external refsmicael.bergeron2017-11-151-1/+1
| * | | fix the commit reference pattern from matching other entitiesmicael.bergeron2017-11-153-1/+29
* | | | Merge branch '40367-tagspage-tags' into 'master'Douwe Maan2017-11-211-1/+1
|\ \ \ \
| * | | | Use the correct i18n helper for namespaced string40367-tagspage-tagsRémy Coutable2017-11-211-1/+1
* | | | | Merge branch 'zj-commit-show-n-1' into 'master'Sean McGivern2017-11-2118-56/+86
|\ \ \ \ \
| * | | | | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-2118-56/+86
* | | | | | Merge branch 'issue_40337' into 'master'Sean McGivern2017-11-213-9/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix promoting milestone updating all issuables without milestoneissue_40337Felipe Artur2017-11-213-9/+55
* | | | | | Merge branch 'gitaly-test-no-deployment' into 'master'Sean McGivern2017-11-212-5/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix slow gitaly dev test bundleJacob Vosmaer (GitLab)2017-11-212-5/+3
|/ / / / /
* | | | | Merge branch '38869-milestone' into 'master'Phil Hughes2017-11-2110-209/+176
|\ \ \ \ \
| * | | | | Export code as ES6 modules38869-milestoneFilipa Lacerda2017-11-2010-209/+176
| | |_|/ / | |/| | |
* | | | | Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-216-3/+72
|\ \ \ \ \
| * | | | | Backport ability to enable/disable file attachments in issuable formClement Ho2017-11-216-3/+72
|/ / / / /
* | | | | Merge branch 'sh-memoize-gitlab-shell' into 'master'Douwe Maan2017-11-211-1/+1
|\ \ \ \ \
| * | | | | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
* | | | | | Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'Phil Hughes2017-11-213-0/+14
|\ \ \ \ \ \
| * | | | | | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editorEric Eastwood2017-11-203-0/+14
* | | | | | | Merge branch 'rc/remove-useless-allow-failure' into 'master'Grzegorz Bizon2017-11-211-2/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failureRémy Coutable2017-11-201-2/+1
* | | | | | | Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-211-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Update gRPC to v1.7.2Alejandro Rodríguez2017-11-201-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-202-47/+5
|\ \ \ \ \ \
| * | | | | | added changelog entry40290-remove-rake-gitlab-sidekiq-drop-post-receivedigitalMoksha2017-11-201-0/+5
| * | | | | | remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
* | | | | | | Merge branch 'fix-mr-cleanup' into 'master'Sean McGivern2017-11-201-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix merge_requests.source_project_id migrationfix-mr-cleanupYorick Peterse2017-11-201-4/+4
* | | | | | | | Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-204-4/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ceDouwe Maan2017-11-201-1/+1
| * | | | | | | | Impersonation no longer gets stuck on password change.Tiago Botelho2017-11-204-4/+34
| |/ / / / / / /