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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes if case to render author info in releasesfl-releases-fix-author	Filipa Lacerda	2018-12-21	1	-0/+4
\|
*	Rename `ClusterPlatformConfigureWorker`	George Tsiolis	2018-12-21	8	-12/+80
\|
*	Merge branch 'markdown-toolbar-btn-fix' into 'master'	Filipa Lacerda	2018-12-21	1	-1/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the markdown toolbar buttons Closes #55618 See merge request gitlab-org/gitlab-ce!23979
\| *	Fixes the markdown toolbar buttons	Phil Hughes	2018-12-21	1	-1/+5
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55618
* \|	Merge branch 'feature/option-to-make-variables-protected' into 'master'	Grzegorz Bizon	2018-12-21	2	-0/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Option to make variables protected by default Closes #51822 See merge request gitlab-org/gitlab-ce!22744
\| * \	Merge branch 'master' into 'feature/option-to-make-variables-protected'	Grzegorz Bizon	2018-12-20	659	-5821/+20171
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: db/schema.rb
\| * \| \|	callout when ci variables are protected by default	Alexis Reigel	2018-12-04	1	-4/+12
\| \| \| \|
\| * \| \|	option to make variables protected by default	Alexis Reigel	2018-11-29	2	-0/+40
\| \| \| \|
* \| \| \|	Resolve "Wrong API call on releases page"	Filipa Lacerda	2018-12-21	1	-10/+10
\| \| \| \|
* \| \| \|	Merge branch ↵	Filipa Lacerda	2018-12-21	1	-5/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'55293-split-bio-into-individual-line-in-extended-user-tooltips' into 'master' Resolve "Split bio into individual line in extended user tooltips" Closes #55293 See merge request gitlab-org/gitlab-ce!23940
\| * \| \| \|	Split bio into individual line in extended user tooltips	Martin Wortschack	2018-12-21	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove leading 'at' in organzation info - Update karma tests
* \| \| \| \|	Merge branch '53933-include-dates-in-milestone-change-email' into 'master'	Lin Jen-Shin	2018-12-21	1	-0/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add date range to milestone changed emails Closes #53933 See merge request gitlab-org/gitlab-ce!23762
\| * \| \| \| \|	Add date range to milestone changed emails	Heinrich Lee Yu	2018-12-21	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also refactored issues and MRs to use the same email template file
* \| \| \| \| \|	Merge branch 'specs-positional-arguments' into 'master'	Lin Jen-Shin	2018-12-21	36	-158/+160
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5: convert specs in javascripts/ and support/ to new spec syntax See merge request gitlab-org/gitlab-ce!23947
\| * \| \| \| \| \|	convert specs in javascripts/ and support/ to new syntax	Jasper Maes	2018-12-21	36	-158/+160
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	John Jarvis	2018-12-21	4	-1/+52
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'security-import-symlink' into 'master'	John Jarvis	2018-12-21	4	-1/+52
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Persistent Symlink in Project Import See merge request gitlab/gitlabhq!2673
\| \| * \| \| \| \| \| \|	Fix persistent symlink in project import	James Lopez	2018-12-17	4	-1/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix permissions after untar is done - Refactor command line util
* \| \| \| \| \| \| \| \|	Merge branch 'dm-note-email-image-diff-discussion' into 'master'	Sean McGivern	2018-12-21	4	-28/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notification email for image diff notes See merge request gitlab-org/gitlab-ce!23958
\| * \| \| \| \| \| \| \| \|	Always use colon at end of discussion notification email headline	Douwe Maan	2018-12-20	1	-10/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow truncated_diff_lines to be called on image diff discussion	Douwe Maan	2018-12-20	1	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add image_diff_note_on_merge_request factory	Douwe Maan	2018-12-20	2	-16/+16
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '55611-always-load-metrics-the-last' into 'master'	Sean McGivern	2018-12-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always load the metrics the last Closes #55611 See merge request gitlab-org/gitlab-ce!23960
\| * \| \| \| \| \| \| \| \|	Always load the metrics the last	Lin Jen-Shin	2018-12-21	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because this could potentially load a model and we shouldn't load models before all the patches we have in places.
* \| \| \| \| \| \| \| \|	Merge branch 'winh-merge-request-commit-context' into 'master'	Kushal Pandya	2018-12-21	1	-8/+65
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display commit ID for discussions made on merge request commits Closes #53953 See merge request gitlab-org/gitlab-ce!23837
\| * \| \| \| \| \| \| \|	MR commits display commit ID for discussions	Fatih Acet	2018-12-21	1	-8/+65
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a bug where merge request comments made in the context of a specific commit no longer specify which commit they were created on
* \| \| \| \| \| \| \|	Merge branch 'winh-discussion-header-commented' into 'master'	Mike Greiling	2018-12-20	2	-2/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display "commented" only for commit discussions on merge requests Closes #53950 and #53681 See merge request gitlab-org/gitlab-ce!23622
\| * \| \| \| \| \| \|	Link to specific commit note from MR commit discussion link	Douwe Maan	2018-12-19	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for commit ID in discussion header	Winnie Hellmann	2018-12-19	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-55448' into 'master'	Lin Jen-Shin	2018-12-20	5	-27/+35
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated xhr from specs Closes #55448 See merge request gitlab-org/gitlab-ce!23949
\| * \| \| \| \| \| \|	Remove deprecated xhr from specs	Jasper Maes	2018-12-19	5	-27/+35
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ce-8333-add-related-epics-support' into 'master'	Dmitriy Zaporozhets	2018-12-20	13	-27/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port: Rename GroupHierarchy into ObjectHierarchy See merge request gitlab-org/gitlab-ce!23923
\| * \| \| \| \| \| \|	Rename GroupHierarchy into ObjectHierarchy	Jarka Košanová	2018-12-19	13	-27/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- we now use the hierarchy class also for epics - also rename supports_nested_groups? into supports_nested_objects? - move it to a concern
* \| \| \| \| \| \| \|	Merge branch '55359-add-tests-for-redesign-projects-lists-ui' into 'master'	Sean McGivern	2018-12-20	2	-0/+116
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add tests for "Redesign projects lists UI"" Closes #55359 See merge request gitlab-org/gitlab-ce!23915
\| * \| \| \| \| \| \|	Add test for compact mode and for helpers	Martin Wortschack	2018-12-19	2	-0/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- add tests for merge_request_count - add tests for show_issue_count - add tests for explore_projects_tab - change interface for show_merge_request_count and show_issue_count
* \| \| \| \| \| \| \|	Merge branch 'fj-remove-pipeline_ci_sources_only-feature-glag' into 'master'	Kamil Trzciński	2018-12-20	1	-18/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed pipeline_ci_sources_only feature flag See merge request gitlab-org/gitlab-ce!23926
\| * \| \| \| \| \| \|	Removed pipeline_ci_sources_only feature flag	Francisco Javier López	2018-12-19	1	-18/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the pipeline_ci_sources_only feature flag introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23353
* \| \| \| \| \| \| \|	Merge branch 'sh-cache-avatar-paths' into 'master'	Sean McGivern	2018-12-20	1	-0/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache avatar URLs and paths within a request Closes #55355 See merge request gitlab-org/gitlab-ce!23950
\| * \| \| \| \| \| \| \|	Cache avatar URLs and paths within a request	Stan Hu	2018-12-19	1	-0/+37
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In a merge request with many discussions, the avatar URL can be called thousands of times, inflicting a significant performance penalty especially when avatars are stored in object storage. To mitigate this problem, we can just cache the generated path any time it is requested. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55355
* \| \| \| \| \| \| \|	Resolve "Hide cluster features that don't work yet with Group Clusters"	Mike Greiling	2018-12-20	3	-18/+64
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2018-12-20	1	-2/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'51606-expanding-a-diff-while-having-an-open-comment-form-will-always-scroll-down-to-the-comment' into 'master' Resolve "Expanding a diff while having an open comment form will always scroll down to the comment" Closes #51606 See merge request gitlab-org/gitlab-ce!23849
\| * \| \| \| \| \| \| \|	Utilize :key to minimize extra rerenders	Sam Bigelow	2018-12-17	1	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The diff notes automatically focus on mount, and when using the index (as opposed to line_code) for the v-bind:key, the comment form gets unnecessarily remounted, and therefore refocused.
* \| \| \| \| \| \| \| \|	Adds Vuex Store for the releases page	Filipa Lacerda	2018-12-20	6	-23/+369
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '54814-sidebar-styling-updates' into 'master'	Filipa Lacerda	2018-12-20	3	-19/+10
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Sidebar styling updates" Closes #54814 See merge request gitlab-org/gitlab-ce!23816
\| * \| \| \| \| \| \| \|	Fix style issues in job details sidebar	Nathan Friend	2018-12-19	3	-19/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes a number of minor style issues in the job details sidebar - spacing, font weights, button sizes, and font sizes. More details here: https://gitlab.com/gitlab-org/gitlab-ce/issues/54814
* \| \| \| \| \| \| \| \|	Prevent admins from attempting hashed storage migration on read only DB	Michael Kozono	2018-12-19	1	-2/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'da-refactor-broadcast-message' into 'master'	Stan Hu	2018-12-19	2	-22/+402
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor BroadcastMessage to use Gitlab::JsonCache See merge request gitlab-org/gitlab-ce!23934
\| * \| \| \| \| \| \| \| \|	Refactor BroadcastMessage to use Gitlab::JsonCache	Douglas Barbosa Alexandre	2018-12-19	1	-22/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Port Gitlab::JsonCache to CE	Douglas Barbosa Alexandre	2018-12-19	1	-0/+401
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Make Projects::DeployKeysController EE-ready	Rémy Coutable	2018-12-19	1	-1/+35
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>