summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-autodevops-codeclimate-10-2' into '10-2-stable-patch-2'10-2-stable-patch-2Fabio Busatto2017-11-231-2/+2
|\
| * Lock codeclimate version to 0.69.0Winnie Hellmann2017-11-231-2/+2
* | Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński2017-11-231-1/+0
* | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' in...Filipa Lacerda2017-11-231-0/+4
|/
* Revert "Merge branch 'grpc-update' into 'master'"Winnie Hellmann2017-11-231-2/+2
* Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'Tim Zallmann2017-11-231-1/+1
* Merge branch 'reduce-queries-for-artifacts-button' into 'master'Kamil Trzciński2017-11-233-1/+13
* Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'Clement Ho2017-11-234-1/+55
* Merge branch '40377-blank-states' into 'master'Annabel Dunstone Gray2017-11-235-27/+46
* Merge branch 'fix-ci-pipelines-index' into 'master'Yorick Peterse2017-11-223-2/+42
* Merge branch 'branch-exists-redis' into 'master'Rémy Coutable2017-11-232-5/+26
* Merge branch '40367-tagspage-tags' into 'master'Douwe Maan2017-11-231-1/+1
* Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-234-4/+34
* Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-233-5/+37
* Merge branch 'issue_40337' into 'master'Sean McGivern2017-11-233-9/+55
* Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-234-3/+38
* Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-231-2/+2
* Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-236-3/+72
* Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-232-0/+17
* Merge branch '39167-async-boards-sidebar' into 'master'Sean McGivern2017-11-2320-100/+174
* Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-re...Sean McGivern2017-11-236-3/+66
* Update VERSION to 10.2.1v10.2.1Michael Kozono2017-11-221-1/+1
* Update CHANGELOG.md for 10.2.1Michael Kozono2017-11-222-5/+7
* Merge branch 'pawel/disable_prometheus_metrics' into 'master'10-2-stable-patch-1Stan Hu2017-11-222-3/+8
* Merge branch 'qa/gb/fix-gitlab-qa-entrypoint-bad-merge' into '10-2-stable'Michael Kozono2017-11-221-1/+1
|\
| * Fix incorrect merge in GitLab QA entry pageqa/gb/fix-gitlab-qa-entrypoint-bad-mergeGrzegorz Bizon2017-11-221-1/+1
|/
* Update VERSION to 10.2.0v10.2.0Michael Kozono2017-11-211-1/+1
* Update CHANGELOG.md for 10.2.0Michael Kozono2017-11-21165-837/+187
* Resolve conflicts in lib/tasks/gitlab/cleanup.rake10-2-stable-prepare-finalWinnie Hellmann2017-11-211-4/+0
* Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'Stan Hu2017-11-212-0/+49
* Merge branch '10-2-hashed-storage-file-uploader' into 'master'Stan Hu2017-11-212-15/+45
* Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-212-1/+18
* Merge branch 'opt-in-gitaly' into '10-2-stable'Stan Hu2017-11-211-1/+1
|\
| * Mark all gitaly features as opt-inopt-in-gitalyAlejandro Rodríguez2017-11-211-1/+1
|/
* Update VERSION to 10.2.0-rc4v10.2.0-rc4Winnie Hellmann2017-11-201-1/+1
* Merge branch 'fix-conflict-highlighting' into 'master'10-2-stable-prepare-rc4Douwe Maan2017-11-203-4/+11
* Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-stora...Rémy Coutable2017-11-202-7/+20
* Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-203-1/+20
* Merge branch '4056-hashed-storage-upload-transfers' into 'master'Stan Hu2017-11-201-1/+11
* Update VERSION to 10.2.0-rc3v10.2.0-rc3Michael Kozono2017-11-171-1/+1
* Merge branch '10-2-stable-prepare-rc3' into '10-2-stable'Winnie Hellmann2017-11-17118-574/+1693
|\
| * Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan2017-11-173-11/+51
| * Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-...Douwe Maan2017-11-172-14/+20
| * Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master'10-2-stable-prepare-rc3Nick Thomas2017-11-173-9/+54
| * Merge branch 'ci-pipeline-status-query' into 'master'Kamil Trzciński2017-11-1711-66/+274
| * Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern2017-11-172-3/+10
| * Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'Sean McGivern2017-11-175-33/+130
| * Merge branch 'dm-avatarable-with-asset-host' into 'master'Rémy Coutable2017-11-178-131/+82
| * Merge branch 'fix/sm/fix-condeclimate-version' into 'master'Winnie Hellmann2017-11-171-1/+1
| * Merge branch 'docs/refactor-cluster' into 'master'Marcia Ramos2017-11-172-33/+47