summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-6ac777a7' into '9-3-stable-rc6'9-3-stable-rc6Clement Ho2017-06-2110-262/+111
|\
| * Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"Clement Ho2017-06-2010-262/+111
* | Merge branch 'delete-fix-missing-function-changelog' into 'master'Stan Hu2017-06-201-4/+0
* | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'Jacob Schatz2017-06-203-33/+78
|/
* Restore class that went missing in conflict resolution to fix specDouwe Maan2017-06-201-1/+1
* Fix docs lintClement Ho2017-06-201-2/+2
* Merge branch 'disable-Style/PreferredHashMethods-cop' into 'master'Robert Speicher2017-06-201-1/+1
* Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-204-39/+68
* Merge branch '33922-add-ruby-metrics-documentation' into 'master'Achilleas Pipinellis2017-06-203-2/+57
* Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-204-31/+67
* Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-205-7/+25
* Merge branch 'docs/subgroups-mysql' into 'master'Marcia Ramos2017-06-203-58/+53
* Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-2010-59/+234
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-204-1/+54
* Merge branch 'remove-changelog' into 'master'Clement Ho2017-06-201-4/+0
* Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-206-4/+53
* Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-204-16/+16
* Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-3/+0
* Merge branch '33840-revert-sticky-confidential-header' into 'master'Clement Ho2017-06-204-37/+43
* Update VERSION to 9.3.0-rc5v9.3.0-rc5kushalpandya2017-06-201-1/+1
* Merge branch '9-3-stable-rc5' into '9-3-stable'Kushal Pandya2017-06-2049-255/+708
|\
| * Merge branch 'issue-task-status-fix' into 'master'9-3-stable-rc5Filipa Lacerda2017-06-206-34/+41
| * Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-202-2/+4
| * Merge branch '33865-add-emoji-parallel-view' into 'master'Phil Hughes2017-06-201-5/+0
| * Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-202-1/+17
| * Merge branch 'fix-missing-function-dropzone-input' into 'master'Stan Hu2017-06-202-0/+8
| * Remove double escaping of comment preview textkushalpandya2017-06-201-2/+1
| * Merge branch '9-3-stable-rc5-autocomplete' into '9-3-stable-rc5'Kushal Pandya2017-06-206-5/+39
| |\
| | * 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