summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-issue-33756' into 'master'9-3-stable-rc3Rémy Coutable2017-06-161-4/+4
* Merge branch 'issue-board-docs' into 'master'Achilleas Pipinellis2017-06-161-2/+3
* Merge branch 'jira-integ-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+3
* Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+2
* Merge branch 'convdev-docs' into 'master'Achilleas Pipinellis2017-06-163-1/+31
* Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-161-2/+3
* Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-162-1/+5
* Resolve conflicts in job entity specsGrzegorz Bizon2017-06-161-26/+1
* Fix conflict in doc/api/README.mdAchilleas Pipinellis2017-06-161-8/+3
* Revert 'New file from interface on existing branch'Douwe Maan2017-06-1628-720/+24
* Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-163-1/+14
* Merge branch 'docs/personal-access-tokens' into 'master'Sean Packham2017-06-1611-86/+162
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1625-112/+278
* Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-161-1/+1
* Merge branch 'gitlab-workhorse-2.1.1' into 'master'Douwe Maan2017-06-161-1/+1
* Merge branch '33639-whitespace' into 'master'Phil Hughes2017-06-161-0/+1
* Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-163-2/+43
* Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-164-13/+12
* Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-167-31/+77
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1627-2/+771
* Merge branch 'patch-8' into 'master'Grzegorz Bizon2017-06-161-0/+20
* Merge branch '33469-focus' into 'master'Annabel Dunstone Gray2017-06-162-1/+5
* Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-162-37/+30
* Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-161-1/+1
* Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-163-0/+17
* Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-163-48/+59
* Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-161-1/+10
* Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-167-56/+36
* Merge branch 'gitaly-0.11.2' into 'master'Stan Hu2017-06-161-1/+1
* Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-162-3/+70
* Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-162-1/+18
* Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-162-1/+5
* Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-165-5/+25
* Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-162-6/+3
* Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-162-26/+3
* Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-163-0/+8
* Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-163-2/+6
* Update VERSION to 9.3.0-rc2v9.3.0-rc2kushalpandya2017-06-161-1/+1
* Merge branch 'winh-ignore-CVE-2017-5029' into 'master'Robert Speicher2017-06-131-1/+1
* Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-131-2/+18
* Merge branch '9-3-stable-rc2' into '9-3-stable'Kushal Pandya2017-06-102433-16873/+48517
|\
| * Fix bad merge9-3-stable-rc2Clement Ho2017-06-093-20/+1
| * remove lines that were incorrectly reinserted after 4f824d2aMike Greiling2017-06-091-3/+1
| * Remove duplicate methodClement Ho2017-06-091-6/+0
| * resolve more inconsistenciesMike Greiling2017-06-092-19/+1
| * Resolve inconsistenciesClement Ho2017-06-0913-423/+3
| * Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-09137-687/+5025
| |\
| | * Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0855-66/+1256
| | |\
| | | * Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-updateDJ Mountney2017-06-082-6/+10
| | | |\
| | | | * Update rename_system_namespace_spec to new validations.upstream-9-2-securityBob Van Landuyt2017-06-081-5/+7