summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Gitaly 0.59.2gitaly-0.59.2Jacob Vosmaer2017-12-201-1/+1
* Merge branch 'fix-throttled-update-for-10-3' into '10-3-stable'Oswaldo Ferreira2017-12-1910-3/+85
|\
| * Return the noteable in Note#touch_noteablefix-throttled-update-for-10-3Yorick Peterse2017-12-141-0/+3
| * Restore throttling of touchYorick Peterse2017-12-1410-3/+82
* | Update VERSION to 10.3.0-rc2v10.3.0-rc2James Lopez2017-12-191-1/+1
* | Merge branch 'sh-fix-milestone-id-migration' into 'master'Oswaldo Ferreira2017-12-181-0/+1
* | Update VERSION to 10.3.0-rc1v10.3.0-rc110-3-stable-prepare-rc2Tiago Botelho2017-12-141-1/+1
|/
* Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-143-10/+7
* Merge branch '10-3-stable-prepare-rc1' into '10-3-stable'James Lopez2017-12-14173-1795/+2807
|\
| * Merge branch 'issue_41021' into 'master'10-3-stable-prepare-rc1Sean McGivern2017-12-138-8/+62
| * Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"Oswaldo Ferreira2017-12-137-57/+13
| * Fix merge_request.rb conflict resolutionLUKE BENNETT2017-12-131-1/+0
| * Fix wrong conflict resolution on !15858Oswaldo Ferreira2017-12-131-2/+1
| * Merge branch '10-3-stable-prepare-rc1' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2017-12-1325-1162/+610
| |\
| | * Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'Achilleas Pipinellis2017-12-131-22/+39
| | * Merge branch 'winh-merge-dev-docs' into 'master'Winnie Hellmann2017-12-131-2/+24
| | * Merge branch 'update-dependencies-license-list' into 'master'LUKE BENNETT2017-12-131-1070/+27
| | * Merge branch '10-3-gitignore' into 'master'Tiago2017-12-1318-63/+150
| | * Merge branch '10-3-update-guide' into 'master'Tiago2017-12-131-0/+360
| | * Merge branch '10-3-installation-from-source' into 'master'Tiago2017-12-131-2/+2
| | * Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into...Tim Zallmann2017-12-132-3/+8
| * | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-137-13/+58
| |/
| * Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-132-0/+4
| * Merge branch 'mk-fix-leaky-spec' into 'master'Stan Hu2017-12-131-4/+13
| * Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-134-55/+46
| * Merge branch 'optimize-projects-for-imported-projects' into 'master'Yorick Peterse2017-12-132-1/+8
| * Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-135-2/+37
| * Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-136-21/+39
| * Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master'Filipa Lacerda2017-12-131-0/+0
| * Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-lo...Douwe Maan2017-12-131-0/+6
| * Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-132-8/+22
| * Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-132-2/+14
| * Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'Stan Hu2017-12-132-0/+7
| * Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-1311-82/+151
| * Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-1312-33/+43
| * Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-132-2/+2
| * Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-135-97/+5
| * Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-1314-46/+231
| * Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-132-2/+25
| * Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'Grzegorz Bizon2017-12-131-1/+1
| * Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-131-2/+8
| * Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-1316-111/+367
| * Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-135-0/+32
| * Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-1312-38/+199
| * Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-1320-52/+510
| * Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-132-1/+6
| * Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-...Sean McGivern2017-12-1316-68/+363
|/
* Revert "Merge branch 'throttle-touching-of-objects' into 'master'"Oswaldo Ferreira2017-12-1210-82/+3
* Merge branch 'bvl-circuitbreaker-process' into 'master'Douwe Maan2017-12-0845-362/+983
|\
| * Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0845-362/+983
|/