delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru	Pawel Chojnacki	2017-06-15	2	-3/+3
\|
*	Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urls	Rémy Coutable	2017-06-15	1	-0/+12
\|\ \| \| \| \| \| \| \| \|	Service hostname also include registry name, when using non Docker Hub registry. See merge request !11729
\| *	Language typos fixed	Matej Zerovnik	2017-06-12	1	-2/+2
\| \|
\| *	Service hostname also include registry name, when using non Docker Hub registry.	Matej	2017-05-26	1	-0/+12
\| \|
* \|	Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'	Annabel Dunstone Gray	2017-06-15	1	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix file diff title and renames alignment in discussions Closes #31782 See merge request !12169
\| * \|	Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignment	Eric Eastwood	2017-06-14	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31782 The unused toggle was removed previously, https://gitlab.com/gitlab-org/gitlab-ce/commit/cc37d1dfa11691f2d8357151d4b722b3d114881e#cf11229dd714f7f4b46f102ce6846e25528b6689_7_6
* \| \|	Merge branch 'deprecate-gitaly-path' into 'master'	Sean McGivern	2017-06-15	9	-23/+361
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using deprecated `path` field on Gitaly messages See merge request !12112
\| * \| \|	Stop using deprecated `path` field on Gitaly messages	Alejandro Rodríguez	2017-06-14	9	-23/+361
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included
* \| \| \|	Merge branch '13336-multiple-broadcast-messages' into 'master'	Rémy Coutable	2017-06-15	7	-19/+61
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#13336 - display multiple messages in both the UI and git output Closes #13336 See merge request !11113
\| * \| \| \|	#13336 - display multiple messages in both the UI and git output	Mike Ricketts	2017-06-15	7	-19/+61
\|/ / / /
* \| \| \|	Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master'	Rémy Coutable	2017-06-15	1	-0/+87
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document a new migrations testing technique Closes #33565 See merge request !12181
\| * \| \| \|	Document a new migrations testing techniquedocs/gb/document-new-migrations-testing-technique	Grzegorz Bizon	2017-06-15	1	-0/+87
\| \| \| \| \|
* \| \| \| \|	Merge branch '23998-blame-age-map' into 'master'	Annabel Dunstone Gray	2017-06-15	7	-3/+158
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add age color mapping to blame view Closes #23998 See merge request !7198
\| * \| \| \| \|	Add blame view age map	Jeff Stubler	2017-06-14	7	-3/+158
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'	Rémy Coutable	2017-06-15	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make spec/spec_helper consistent with EE by including a :routing type See merge request !12178
\| * \| \| \| \| \|	Make spec/spec_helper consistent with EE by including a :routing typesh-fix-spec-helper-ee-consistency	Stan Hu	2017-06-14	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-manual-actions' into 'master'	Grzegorz Bizon	2017-06-15	5	-5/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show manual actions that cannot be run Closes #32380 See merge request !12121
\| * \| \| \| \| \| \|	Do not show manual actions that cannot be runfix-manual-actions	Kamil Trzcinski	2017-06-13	5	-5/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'	Sean McGivern	2017-06-15	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport merge_params.html.haml conflict comment See merge request !12138
\| * \| \| \| \| \| \|	Improve conflict message in _merge_params.html.haml	Luke "Jared" Bennett	2017-06-14	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Backport merge_params.html.haml conflict comment	Luke "Jared" Bennett	2017-06-14	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'instrument-merge-request-diff-load-commits' into 'master'	Sean McGivern	2017-06-15	3	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequestDiff#load_commits See merge request !12162
\| * \| \| \| \| \| \|	Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commits	Sean McGivern	2017-06-14	3	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This instrumentation isn't needed strictly for performance measurements, but just to see which controller actions call this method at all. See <https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159> for more details.
* \| \| \| \| \| \| \|	Merge branch 'dm-fix-parser-cache' into 'master'	Sean McGivern	2017-06-15	3	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't return nil for missing objects from parser cache See merge request !12168
\| * \| \| \| \| \| \| \|	Don't return nil for missing objects from parser cachedm-fix-parser-cache	Douwe Maan	2017-06-14	3	-2/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'	Phil Hughes	2017-06-15	2	-3/+70
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note highlight being lost after real time update Closes #33483 See merge request !12098
\| * \| \| \| \| \| \| \| \|	Fix note highlight being lost after real time update	Eric Eastwood	2017-06-14	2	-3/+70
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483
* \| \| \| \| \| \| \| \|	Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'	Phil Hughes	2017-06-15	2	-11/+23
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone page assignees when dropped in ongoing list Closes #32861 See merge request !12076
\| * \| \| \| \| \| \| \|	Fix milestone page assignees when dropped in ongoing list	Eric Eastwood	2017-06-14	2	-11/+23
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32861
* \| \| \| \| \| \| \|	Merge branch 'dm-target-branch-slash-command-desc' into 'master'	Robert Speicher	2017-06-14	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update /target_branch slash command description to be more consistent See merge request !12175
\| * \| \| \| \| \| \| \|	Update /target_branch slash command description to be more consistentdm-target-branch-slash-command-desc	Douwe Maan	2017-06-14	2	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-fix-codeclimate-build' into 'master'	Douwe Maan	2017-06-14	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require rubocop-rspec in the correct location See merge request !12174
\| * \| \| \| \| \| \| \| \|	Require rubocop-rspec in the correct locationrs-fix-codeclimate-build	Robert Speicher	2017-06-14	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves the `codeclimate` CI failure
* \| \| \| \| \| \| \| \| \|	Remove extra line so that it is consistent with EE	Clement Ho	2017-06-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' ↵	Clement Ho	2017-06-14	2	-1/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix autocomplete not working on note edit form Closes #33529 See merge request !12106
\| * \| \| \| \| \| \| \| \|	Fix autocomplete not working on note edit form	Eric Eastwood	2017-06-14	2	-1/+18
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278
* \| \| \| \| \| \| \| \|	Merge branch 'pipelines-row-vue-file-fix' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed pipelines Vue template not ending correctly See merge request !12170
\| * \| \| \| \| \| \| \| \|	Fixed pipelines Vue template not ending correctlypipelines-row-vue-file-fix	Phil Hughes	2017-06-14	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'winh-select2-remove-token' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move remove token of Select2 to the right See merge request !12101
\| * \| \| \| \| \| \| \|	Move remove token of Select2 to the right	winh	2017-06-14	1	-2/+4
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-single-line-rspec-hook-cop' into 'master'	Douwe Maan	2017-06-14	209	-633/+2051
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a custom RSpec/SingleLineHook cop Closes #24891 See merge request !11911
\| * \| \| \| \| \| \| \|	Enable RSpec/SingleLineHook cop	Robert Speicher	2017-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Correct RSpec/SingleLineHook cop offenses	Robert Speicher	2017-06-14	205	-633/+1940
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a custom RSpec/SingleLineHook cop	Robert Speicher	2017-06-14	4	-0/+111
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This cop adds an offense when `before`, `after`, or `around` are used as single-line blocks.
* \| \| \| \| \| \| \|	Merge branch '31263-fix-fenced-code-misalignment-with-activity' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fenced code block misalignment in events/activity Closes #31263 See merge request !12149
\| * \| \| \| \| \| \| \|	Fix fenced code block misalignment in events/activity31263-fix-fenced-code-misalignment-with-activity	Eric Eastwood	2017-06-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31263 `.event-item` is only used within the `events/_event` partial. `.event-note` is only used within the `events/event/_common`(but no markdown) and `events/event/_note` partials. The fenced code `pre` style is scoped to `.event-item .event-note` Pages where events are used - User profile, ex. `/root` - Group Activity, ex. `/groups/foo/activity` - Project Activity, ex. `/foo/bar/activity
* \| \| \| \| \| \| \| \|	Merge branch 'dz-add-codeclimate-job' into 'master'	Dmitriy Zaporozhets	2017-06-14	2	-3/+27
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add codeclimate job to .gitlab-ci.yml See merge request !12086
\| * \| \| \| \| \| \| \| \|	Exclude more path from codeclimate job	Dmitriy Zaporozhets	2017-06-14	2	-15/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Improve codeclimate.yml to avoid timeouts	Dmitriy Zaporozhets	2017-06-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add codeclimate job to .gitlab-ci.yml	Dmitriy Zaporozhets	2017-06-14	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>