summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename matchergit-user-encodingJacob Vosmaer2017-11-222-3/+3
* Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer2017-11-225-8/+32
* Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-226-1/+133
|\
| * Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-074-30/+13
| * Add Group Milestone sortingGeorge Andrinopoulos2017-11-077-1/+150
* | Merge branch 'sh-add-query-recorder-debugging' into 'master'Sean McGivern2017-11-222-0/+53
|\ \
| * | Add QUERY_RECORDER_DEBUG environment variable to improve performance debuggingsh-add-query-recorder-debuggingStan Hu2017-11-212-0/+53
* | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-2219-41/+211
|\ \ \
| * | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-2219-41/+211
* | | | Merge branch 'gitaly-fetch-source-branch' into 'master'Sean McGivern2017-11-228-11/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-228-11/+49
|/ / /
* | | Update VERSION to 10.3.0-prev10.3.0.preMichael Kozono2017-11-211-1/+1
* | | Update CHANGELOG.md for 10.2.0Michael Kozono2017-11-21147-744/+187
* | | Merge remote-tracking branch 'dev/master'Michael Kozono2017-11-210-0/+0
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-11-2172-270/+813
| |\ \ \
| * | | | Fix offense to the LineBreakAfterGuardClauses copRémy Coutable2017-11-201-0/+2
* | | | | Merge branch 'fix-ci-pipelines-index' into 'master'Yorick Peterse2017-11-213-2/+42
|\ \ \ \ \
| * | | | | Update composite pipelines index to include "id"fix-ci-pipelines-indexYorick Peterse2017-11-213-2/+42
* | | | | | Merge branch 'svg-color' into 'master'Annabel Dunstone Gray2017-11-2110-108/+2
|\ \ \ \ \ \
| * | | | | | default fill color for SVGsSimon Knox2017-11-2110-108/+2
|/ / / / / /
* | | | | | Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'Stan Hu2017-11-212-1/+45
|\ \ \ \ \ \
| * | | | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`Brett Walker2017-11-212-1/+45
|/ / / / / /
* | | | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master'Douwe Maan2017-11-215-6/+11
|\ \ \ \ \ \
| * | | | | | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-215-6/+11
* | | | | | | Merge branch 'branch-exists-redis' into 'master'Rémy Coutable2017-11-212-5/+26
|\ \ \ \ \ \ \
| * | | | | | | Use Redis cache for branch existence checksJacob Vosmaer (GitLab)2017-11-212-5/+26
|/ / / / / / /
* | | | | | | Merge branch 'update-contributing-md-to-less-prescriptive' into 'master'🚄 Job van der Voort 🚀2017-11-211-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Update CONTRIBUTING.md: Link definition of done to criteriaVictor Wu2017-11-211-0/+1
|/ / / / / / /
* | | | | | | Merge branch '10-2-hashed-storage-file-uploader' into 'master'Stan Hu2017-11-212-15/+45
|\ \ \ \ \ \ \
| * | | | | | | FileUploader should check for hashed_storage?(:attachments) to use disk_pathGabriel Mazetto2017-11-212-15/+45
* | | | | | | | Merge branch 'simplify-feature-proposals' into 'master'🚄 Job van der Voort 🚀2017-11-211-42/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify Feature Proposal templatesimplify-feature-proposalsMark Pundsack2017-11-091-42/+1
* | | | | | | | | Merge branch 'reduce-queries-for-artifacts-button' into 'master'Kamil Trzciński2017-11-213-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use arrays in Pipeline#latest_builds_with_artifactsreduce-queries-for-artifacts-buttonYorick Peterse2017-11-213-1/+13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gitaly-bundle-changes' into 'master'Rémy Coutable2017-11-212-10/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Use `make install` for Gitaly setups in non-test environmentsAlejandro Rodríguez2017-11-212-10/+17
|/ / / / / / / /
* | | | | | | | 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
|/ / / / / / / / / /