summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve "slash command" vs "quick action" conflicts9-3-stable-rc5-autocompleteEric Eastwood2017-06-192-24/+5
* Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-196-3/+56
* Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-192-0/+16
* Merge branch 'winh-merge-request-related-issues' into 'master'Fatih Acet2017-06-1910-111/+262
* Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-198-48/+147
* Merge branch 'docs/object-storage' into 'master'Achilleas Pipinellis2017-06-191-1/+13
* Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-195-20/+120
* Merge branch 'group-label-permissions-docs' into 'master'Achilleas Pipinellis2017-06-191-0/+1
* Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-193-2/+6
* Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-195-24/+33
* Update VERSION to 9.3.0-rc4v9.3.0-rc4Clement Ho2017-06-191-1/+1
* Merge branch '9-3-stable-rc4' into '9-3-stable'Clement Ho2017-06-19177-1215/+2305
|\
| * Merge branch 'issue-board-docs' into 'master'Achilleas Pipinellis2017-06-191-2/+3
| * Merge branch 'jira-integ-docs' into 'master'Achilleas Pipinellis2017-06-192-3/+3
| * Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-192-3/+2
| * Merge branch 'convdev-docs' into 'master'Achilleas Pipinellis2017-06-193-1/+31
| * Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-191-2/+3
| * Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-192-1/+5
| * Resolve conflicts in job entity specsGrzegorz Bizon2017-06-191-26/+1
| * Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1925-112/+278
| * Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-195-32/+127
| * Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
| * Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4'Clement Ho2017-06-19140-1130/+1949
| |\ |/ /
| * Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-1627-99/+545
| * Merge branch '9-3-stable-rc3-conflicts-docs' into '9-3-stable-rc3'Achilleas Pipinellis2017-06-1511-90/+161
| |\
| | * Fix conflict in doc/api/README.mdAchilleas Pipinellis2017-06-151-8/+3
| | * Merge branch 'docs/personal-access-tokens' into 'master'9-3-stable-rc3-conflicts-docsSean Packham2017-06-1511-86/+162
| * | Revert 'New file from interface on existing branch'Douwe Maan2017-06-1528-720/+24
| * | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-153-1/+14
| * | 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