summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Solved conflicts10-1-jivl-fix-cancel-button-file-upload-new-issueJose Ivan Vargas2017-11-061-69/+1
* Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-063-0/+81
* Update VERSION to 10.1.1v10.1.1Winnie Hellmann2017-10-311-1/+1
* Update CHANGELOG.md for 10.1.1Winnie Hellmann2017-10-3122-107/+24
* Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-11-019-12/+35
* Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-11-017-1/+27
* Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-311-1/+4
* Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-314-16/+20
* Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
* Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_...Stan Hu2017-10-302-3/+3
* Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
* Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canc...Yorick Peterse2017-10-302-1/+6
* Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-59/+31
* Merge branch 'bvl-circuitbreaker-patch' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3027-306/+470
|\
| * Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-3019-196/+275
| * Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-3021-127/+212
|/
* Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-306-36/+33
* Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-304-1/+16
* Merge branch '10-1-stable-patch-1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3041-99/+423
|\
| * Merge remote-tracking branch 'upstream/10-1-stable' into 10-1-stable-patch-110-1-stable-patch-1Lin Jen-Shin2017-10-302-1/+6
| |\ | |/ |/|
* | Merge branch 'an/update-gitaly-10-1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-272-1/+6
|\ \
| * | Update gitaly in Gitlab 10.1 to 0.43.1Andrew Newdigate2017-10-272-1/+6
|/ /
| * Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos2017-10-284-13/+10
| * Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-283-2/+54
| * Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable2017-10-283-26/+24
| * Merge branch 'patch-29' into 'master'Sean McGivern2017-10-281-1/+0
| * Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-10-281-2/+22
| * Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-283-4/+14
| * Merge branch '39441-bring-edit-form-back' into 'master'Rémy Coutable2017-10-2810-28/+246
| * Merge branch '39495-fix-bitbucket-login' into 'master'Rémy Coutable2017-10-272-0/+9
| * Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-10-252-11/+5
| * Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-243-1/+16
| * Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
| * Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
| * Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-243-3/+7
| * Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-242-4/+7
| * Merge branch 'docs/ci-disposable-environment' into 'master'Achilleas Pipinellis2017-10-241-0/+2
|/
* Update VERSION to 10.1.0v10.1.0Stan Hu2017-10-211-1/+1
* Update CHANGELOG.md for 10.1.0Stan Hu2017-10-21190-947/+192
* Update VERSION to 10.1.0-rc4v10.1.0-rc4Winnie Hellmann2017-10-211-1/+1
* Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'Grzegorz Bizon2017-10-213-10/+19
* Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-204-2/+25
* Merge branch '10-1-stable-prepare-rc4' into '10-1-stable'Winnie Hellmann2017-10-2011-19/+61
|\
| * Merge branch 'fix-non-diff-resolved-discussion' into 'master'Phil Hughes2017-10-203-7/+29
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ...10-1-stable-prepare-rc4Stan Hu2017-10-192-3/+3
| * Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-194-5/+10
| * Merge branch 'encoding-helper-performance' into 'master'Rémy Coutable2017-10-192-4/+19
* | Merge branch 'tc-page-title-encoding-fix' into 'master'Winnie Hellmann2017-10-203-2/+16
|/
* Update VERSION to 10.1.0-rc3v10.1.0-rc3Winnie Hellmann2017-10-191-1/+1