summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolving conflictsh-optimize-groups-api-10-2Francisco Javier López2017-12-141-23/+5
* Resolving conflictFrancisco Javier López2017-12-141-5/+6
* Resolving conflictFrancisco Javier López2017-12-141-4/+1
* Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-1418-32/+271
* Cherry pick lib/api/entities.rb from 763ea26dc6be7760e4084b57bcf56f32e3e9ef0aKamil Trzciński2017-12-141-7/+19
* Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-142-6/+4
* Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into...Tim Zallmann2017-12-142-3/+8
* Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-145-0/+32
* Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2017-12-142-15/+15
* Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-141-0/+10
* Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-host...Jacob Schatz2017-12-142-2/+8
* Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master'Clement Ho2017-12-142-25/+7
* Merge branch '40592-dropdown-options-are-misaligned' into 'master'Clement Ho2017-12-141-0/+1
* Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-148-72/+61
* Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-12-144-17/+48
* Merge branch '40543-generalize-detail-page-headers' into 'master'Phil Hughes2017-12-149-79/+66
* Merge branch 'protected-branches-names' into 'master'Douwe Maan2017-12-143-2/+11
* Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-146-23/+42
* Merge branch '40615-specific-10-2-fix' into '10-2-stable'Winnie Hellmann2017-12-113-0/+17
|\
| * Merge branch 'sh-fix-root-ref-repository' into 'master'40615-specific-10-2-fixRémy Coutable2017-12-013-0/+17
* | 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