summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.2.4v10.2.4Winnie Hellmann2017-12-071-1/+1
* Update CHANGELOG.md for 10.2.4Winnie Hellmann2017-12-074-15/+9
* Merge branch '10-2-stable-patch-4' into '10-2-stable'Winnie Hellmann2017-12-0616-47/+231
|\
| * Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-062-1/+17
| * Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-063-0/+21
| * Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-063-2/+82
| * Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-064-33/+40
| * Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ...Douwe Maan2017-12-064-11/+71
|/
* Update VERSION to 10.2.3v10.2.3Michael Kozono2017-11-301-1/+1
* Update CHANGELOG.md for 10.2.3Michael Kozono2017-11-3011-51/+19
* Merge branch '10-2-stable-patch-3' into '10-2-stable'Winnie Hellmann2017-11-3080-281/+1549
|\
| * Merge branch 'gitaly-0.52.1' into '10-2-stable-patch-3'10-2-stable-patch-3Winnie Hellmann2017-11-291-1/+1
| |\
| | * Use Gitaly 0.52.1gitaly-0.52.1Jacob Vosmaer2017-11-231-1/+1
| * | Merge branch 'events-atom-feed-author-query' into 'master'Douwe Maan2017-11-292-1/+11
| * | Merge branch 'backport-epic-tasklist' into 'master'Fatih Acet2017-11-296-42/+86
| * | Merge branch 'default-values-for-mr-states' into 'master'Sean McGivern2017-11-295-3/+91
| * | Fix text utility conflictsClement Ho2017-11-282-21/+12
| * | Fix merge_requests/base_service.rb conflictFelipe Artur2017-11-281-5/+0
| * | Merge branch 'optimise-stuck-ci-jobs-worker' into 'master'Yorick Peterse2017-11-285-14/+32
| * | Merge branch 'backport-disable-autocomplete' into 'master'Fatih Acet2017-11-284-3/+28
| * | Merge branch 'backport-epic-fullscreen' into 'master'Fatih Acet2017-11-283-68/+91
| * | Merge branch '10-2-stable-patch-3' of https://gitlab.com/gitlab-org/gitlab-ce...Tiago Botelho2017-11-2810-56/+69
| |\ \
| | * | Merge branch 'dm-project-search-performance' into 'master'Sean McGivern2017-11-286-44/+18
| | * | Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master'Stan Hu2017-11-284-12/+51
| * | | Merge branch 'backport-add-epic-sidebar' into 'master'Fatih Acet2017-11-2817-9/+861
| |/ /
| * | Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-288-26/+100
| * | Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-283-16/+16
| * | Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-284-2/+122
| * | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2815-36/+51
|/ /
* | Update VERSION to 10.2.2v10.2.2Michael Kozono2017-11-231-1/+1
* | Update CHANGELOG.md for 10.2.2Michael Kozono2017-11-2311-50/+22
|/
* Merge branch '10-2-stable-patch-2' into '10-2-stable'Winnie Hellmann2017-11-2370-168/+683
|\
| * 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