summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Update VERSION to 10.1.0-rc3v10.1.0-rc3Winnie Hellmann2017-10-191-1/+1
* Merge branch '10-1-stable-prepare-rc3' into '10-1-stable'Winnie Hellmann2017-10-1854-67/+450
|\
| * Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' i...Rémy Coutable2017-10-181-3/+3
| * Merge branch 'pms-fix-tooltip-padding' into 'master'Annabel Dunstone Gray2017-10-181-1/+1
| * Merge branch 'bvl-fix-locale-path' into 'master'10-1-stable-prepare-rc3Tim Zallmann2017-10-184-1/+18
| * Merge branch 'fix-resolved-side-by-side' into 'master'Phil Hughes2017-10-183-7/+31
| * Merge branch '39201-improve-google-image' into 'master'Phil Hughes2017-10-182-1/+1
| * Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ...Douwe Maan2017-10-182-5/+12
| * Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-186-7/+17
| * Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-184-2/+24
| * Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-183-0/+17
| * Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan...Rémy Coutable2017-10-182-2/+20
| * Merge branch 'bump-git-2-13-6' into 'master'Rémy Coutable2017-10-181-1/+1
| * Merge branch 'update-new-project-docs' into 'master'Achilleas Pipinellis2017-10-182-1/+1
| * Merge branch 'fl-autodevops-fix' into 'master'Phil Hughes2017-10-1810-31/+58
| * Merge branch 'patch-19' into 'master'Sean McGivern2017-10-181-2/+2
| * Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes2017-10-182-0/+6
| * Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-185-1/+208
| * Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-181-1/+2
| * Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-184-0/+31
| * Merge branch '39111-remove-n-shortcut' into 'master'Filipa Lacerda2017-10-181-4/+0
|/
* Update VERSION to 10.1.0-rc2v10.1.0-rc2Lin Jen-Shin2017-10-171-1/+1
* Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-1716-80/+141
|\
| * Those tests were tested under authenticatedLin Jen-Shin2017-10-161-21/+21
| * Fix bad merge with spec/models/namespace_spec.rbStan Hu2017-10-151-1/+1
| * Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher2017-10-154-30/+10
| * Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan2017-10-154-16/+49
| * Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-153-2/+22
| * Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-153-10/+15
| * Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes2017-10-152-2/+25
* | Update VERSION to 10.1.0-rc1v10.1.0-rc1Lin Jen-Shin2017-10-161-1/+1
* | Merge branch '10-1-stable-prepare-rc1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-1698-623/+1352
|\ \ | |/
| * Merge branch '39001-mr-tabs-hover' into 'master'10-1-stable-prepare-rc1Phil Hughes2017-10-131-0/+2
| * Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-137-28/+54
| * Merge branch 'docs-patch-28' into 'master'Achilleas Pipinellis2017-10-131-1/+2
| * Merge branch 'fix-cursor-path' into 'master'Tim Zallmann2017-10-131-2/+2
| * Merge branch 'milestones-permissions-docs' into 'master'Sean McGivern2017-10-131-1/+2
| * Merge branch 'add-resolve-discussion-test' into 'master'Filipa Lacerda2017-10-131-5/+15
| * Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-133-3/+41
| * Merge branch '38574-superfluous-export-in-advanced-settings-of-project-settin...Tim Zallmann2017-10-131-1/+1
| * Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-131-1/+1
| * Merge branch 'docs-image-discussion' into 'master'Achilleas Pipinellis2017-10-136-3/+40
| * Merge branch 'lock-discussion-docs' into 'master'Clement Ho2017-10-132-24/+16
| * Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-133-16/+34
| * Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1315-18/+67
| * Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-134-8/+25
| * Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-135-2/+46