summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflicts in job entity specs9-3-stable-rc3-conflict-ciGrzegorz Bizon2017-06-151-26/+1
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1525-112/+278
* Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-151-1/+1
* Merge branch 'gitlab-workhorse-2.1.1' into 'master'Douwe Maan2017-06-151-1/+1
* Merge branch '33639-whitespace' into 'master'Phil Hughes2017-06-151-0/+1
* Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-153-2/+43
* Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-154-13/+12
* Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-157-31/+77
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1527-2/+771
* Merge branch 'patch-8' into 'master'Grzegorz Bizon2017-06-151-0/+20
* Merge branch '33469-focus' into 'master'Annabel Dunstone Gray2017-06-152-1/+5
* Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-152-37/+30
* Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-151-1/+1
* Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-153-0/+17
* Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-153-48/+59
* Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-151-1/+10
* Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-157-56/+36
* Merge branch 'gitaly-0.11.2' into 'master'Stan Hu2017-06-151-1/+1
* Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-152-3/+70
* Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-152-1/+18
* Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-152-1/+5
* Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-155-5/+25
* Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-152-6/+3
* Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-152-26/+3
* Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-153-0/+8
* Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-153-2/+6
* 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
| | | | * Make the uploader use the updated folderBob Van Landuyt2017-06-081-1/+3
| | | | * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0855-66/+1252
| | | * | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-0837-35/+983
| | | |\ \
| | | | * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0755-66/+1252
| | | * | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-0813-18/+206
| | | * | | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
| | | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-082-11/+21
| | | * | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'DJ Mountney2017-06-082-2/+41
| | * | | | Merge branch 'evn-no-geo-either' into 'master'Stan Hu2017-06-081-1/+2
| | |\ \ \ \
| | | * | | | Update per discussionevn-no-geo-eitherernstvn2017-06-081-1/+1
| | | * | | | GitLab GEO also does not support mysql replicationernstvn2017-06-051-1/+2
| | * | | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-0830-66/+1434
| | |\ \ \ \ \