summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-6ac777a7' into '9-3-stable-rc6'9-3-stable-rc6Clement Ho2017-06-214-196/+85
|\
| * Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"Clement Ho2017-06-204-196/+85
* | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'Jacob Schatz2017-06-202-32/+77
|/
* Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-201-31/+60
* Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-203-17/+48
* Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-203-0/+75
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-0/+30
* Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-202-1/+40
* Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-13/+13
* Merge branch 'issue-task-status-fix' into 'master'9-3-stable-rc5Filipa Lacerda2017-06-201-0/+12
* Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-201-1/+1
* Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-201-0/+16
* Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-192-1/+17
* Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-191-0/+14
* Merge branch 'winh-merge-request-related-issues' into 'master'Fatih Acet2017-06-194-85/+196
* Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-197-41/+140
* Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-193-0/+67
* Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-191-1/+10
* Resolve conflicts in job entity specsGrzegorz Bizon2017-06-191-26/+1
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1910-93/+251
* Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-193-11/+87
* Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4'Clement Ho2017-06-1928-507/+300
|\
| * Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-161-1/+1
| * Revert 'New file from interface on existing branch'Douwe Maan2017-06-159-399/+4
| * Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-151-0/+1
| * Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-152-2/+39
| * Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-153-12/+9
| * Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-153-19/+50
| * Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-152-1/+82
| * Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-151-16/+13
| * Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-152-52/+25
| * Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-0/+45
| * Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-151-0/+17
| * Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-153-3/+19
| * Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-151-1/+1
| * Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-151-12/+1
| * Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-151-0/+1
| * Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
* | Merge branch '33779-reset-session-before-blocking-requests' into 'master'Robert Speicher2017-06-172-6/+9
* | Merge branch 'sh-fix-issue-33756' into 'master'Rémy Coutable2017-06-171-4/+4
* | Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-163-12/+9
|/
* Fix bad merge9-3-stable-rc2Clement Ho2017-06-091-1/+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-094-201/+0
* Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-0927-128/+507
|\
| * Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-0828-41/+748
| |\
| | * Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-updateDJ Mountney2017-06-081-5/+7
| | |\
| | | * Update rename_system_namespace_spec to new validations.upstream-9-2-securityBob Van Landuyt2017-06-081-5/+7