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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update issues/index.md with note on label priority sortingpatch-69	Lucas Charles	2019-06-07	1	-1/+3
\|
*	Merge branch 'docs-scoped-label-key' into 'master'	Mike Lewis	2019-06-07	1	-0/+8
\|\ \| \| \| \| \| \| \| \|	Add a note about nested scopes matching See merge request gitlab-org/gitlab-ce!28466
\| *	Apply suggestion to doc/user/project/labels.mddocs-scoped-label-key	Jan Provaznik	2019-06-05	1	-5/+7
\| \|
\| *	Add a note about nested scopes matching	Jan Provaznik	2019-05-20	1	-0/+6
\| \|
* \|	Merge branch 'ee-9688-fe-mr-merge-order' into 'master'	Clement Ho	2019-06-07	6	-15/+115
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport of EE Displaying Blocking MRs See merge request gitlab-org/gitlab-ce!29095
\| * \|	Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-order	Sam Bigelow	2019-06-05	6	-15/+115
\| \| \| \| \| \| \| \| \| \| \| \|	This MR is a backport of an EE merge request
* \| \|	Merge branch 'mh/board-models-ce' into 'master'	Kushal Pandya	2019-06-07	12	-30/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move issue board models to boards directory Closes #61293 See merge request gitlab-org/gitlab-ce!29260
\| * \| \|	Move Vue models from vue_shared to boards	Martin Hanzel	2019-06-07	12	-30/+28
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* \| \|	Merge branch ↵	Stan Hu	2019-06-07	11	-8/+95
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
\| * \| \|	Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137	mfluharty	2019-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to set masked to true before testing now that the default is false
\| * \| \|	Do not escape forward slashes in Maskable REGEX	Matija Čupić	2019-06-06	1	-1/+1
\| \| \| \|
\| * \| \|	Add frontend specs	mfluharty	2019-06-06	2	-0/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test that a regex is provided Test that it is the expected regex Test length of variable Test special character set
\| * \| \|	Use exposed regex for frontend maskable check	mfluharty	2019-06-06	5	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass string value in through haml template data attribute Evaluate it into a regex when initiating variable list Use it to determine whether to show the maskability warning
\| * \| \|	Add CHANGELOG entry	Matija Čupić	2019-06-06	1	-0/+5
\| \| \| \|
\| * \| \|	Expose javascript regex	Matija Čupić	2019-06-06	2	-2/+5
\| \| \| \|
\| * \| \|	Allow masking if 8 or more characters in base64	Thomas Nilsson	2019-06-06	3	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should allow for private ssh-keys to remain private. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
* \| \| \|	Merge branch 'fix-legacy-uploads-spec' into 'master'	Sean McGivern	2019-06-07	1	-9/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration specs using factories Closes #62911 See merge request gitlab-org/gitlab-ce!29350
\| * \| \| \|	Fix migration specs using factories	Markus Koller	2019-06-07	1	-9/+25
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced. The `let!` calls were executed before the `before` hook which still caused some factories to fail, so they're created in the `before` hook now as well.
* \| \| \|	Merge branch '51636-task-list-api-pderichs' into 'master'	Sean McGivern	2019-06-07	6	-21/+206
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add task count and completed count to responses of Issue and MR See merge request gitlab-org/gitlab-ce!28859
\| * \| \| \|	Add task count and completed count to responses of Issue and MR	Patrick Derichs	2019-06-07	6	-21/+206
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* \| \| \| \|	Merge branch 'improve-email-text-part' into 'master'	Dmitriy Zaporozhets	2019-06-07	4	-9/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve email text part See merge request gitlab-org/gitlab-ce!29111
\| * \| \| \| \|	Add changelog entry	Haunui Saint-sevin	2019-06-04	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Sync text part of email with the HTML part	Haunui Saint-sevin	2019-06-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The text part was missing the condition to change the first message. Borrow the code from the HTML part.
\| * \| \| \| \|	Remove html tag from the text part of email	Haunui Saint-sevin	2019-06-04	3	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of calling single function emitting HTML tags in the HTML part of email, directly output HTML tags or raw text.
* \| \| \| \| \|	Merge branch '58297-remove-extraneous-gitaly-calls-from-md-rendering' into ↵	Dmitriy Zaporozhets	2019-06-07	6	-6/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove extraneous DiffNote#supports_suggestion? calls See merge request gitlab-org/gitlab-ce!29027
\| * \| \| \| \| \|	Add changelog entry58297-remove-extraneous-gitaly-calls-from-md-rendering	Kerri Miller	2019-06-05	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update spec param expectations	Kerri Miller	2019-06-05	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove 2nd stub expectation of #last_diff_file	Kerri Miller	2019-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It looks to be a stub/mock rather than strictly an expectation of the system, so dropping this to only a single invocation expected, as we've removed one of the two places #last_diff_file would be invoked.
\| * \| \| \| \| \|	Extend #parse to accept a suggestions_filter_enabled param	Kerri Miller	2019-06-05	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow the front end to specify the behavior as needed.
\| * \| \| \| \| \|	Lock suggestions_filter_enabled as true	Kerri Miller	2019-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most/all of the work we're doing in this method is done at creation/edit time, so do we need to also check at render? Assume if you've gotten to this point, it's ok to enable the suggestion filter.
* \| \| \| \| \| \|	Merge branch '62418-project-default-git-depth' into 'master'	Kamil Trzciński	2019-06-07	19	-41/+219
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project level git depth setting Closes #59688 See merge request gitlab-org/gitlab-ce!28919
\| * \| \| \| \| \| \|	Comment why forks get default_git_depth of 0 instead nil62418-project-default-git-depth	Krasimir Angelov	2019-06-07	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and simplify ProjectCiCdSetting#set_default_git_depth
\| * \| \| \| \| \| \|	Fix migration specs using factories	Krasimir Angelov	2019-06-07	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced.
\| * \| \| \| \| \| \|	Reformat ProjectCiCdSetting validations specs	Krasimir Angelov	2019-06-06	1	-1/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Forks get default_git_depth 0 if the origin is nil	Krasimir Angelov	2019-06-06	4	-12/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the origin project has no default_git_depth set (i.e. nil) set the fork's default_git_depth to 0
\| * \| \| \| \| \| \|	Add project level git depth setting	Krasimir Angelov	2019-06-06	19	-42/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce default_git_depth in project's CI/CD settings and set it to 50. Use it if there is no GIT_DEPTH variable specified. Apply this default only to newly created projects and keep it nil for old ones in order to not break pipelines that rely on non-shallow clones. default_git_depth can be updated from CI/CD Settings in the UI, must be either nil or integer between 0 and 1000 (incl). Inherit default_git_depth from the origin project when forking projects. MR pipelines are run on a MR ref (refs/merge-requests/:iid/merge) and it contains unique commit (i.e. merge commit) which doesn't exist in the other branch/tags refs. We need to add it cause otherwise it may break pipelines for old projects that have already enabled Pipelines for merge results and have git depth 0. Document new default_git_depth project CI/CD setting
* \| \| \| \| \| \| \|	Merge branch '50070-legacy-attachments' into 'master'	Kamil Trzciński	2019-06-07	6	-4/+485
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate legacy uploads Closes #57217 See merge request gitlab-org/gitlab-ce!24679
\| * \| \| \| \| \| \| \|	Migrate legacy uploads to the project location50070-legacy-attachments	Jarka Košanová	2019-06-06	6	-4/+485
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uploads coming from AttachmentUploader need to be moved to the currently supported location (FileUploader)
* \| \| \| \| \| \| \| \|	Merge branch '10075-dependency-list-docs' into 'master'	Achilleas Pipinellis	2019-06-07	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dependency list documentation See merge request gitlab-org/gitlab-ce!29307
\| * \| \| \| \| \| \| \| \|	Add dependency list documentation	Tetiana Chupryna	2019-06-07	1	-0/+11
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'ce-5276-2-update-stores-for-terminal-file-sync' into 'master'	Phil Hughes	2019-06-07	6	-2/+39
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE of Part 2] 5276 Update existing stores for file terminal sync See merge request gitlab-org/gitlab-ce!29333
\| * \| \| \| \| \| \| \| \|	IDE trigger files change eventce-5276-2-update-stores-for-terminal-file-sync	Paul Slaughter	2019-06-07	6	-2/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- On CMD+S when editor is focused - On editor blur - When file is created in tree - When file is removed in tree - When file is renamed in tree
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-5276-1-remove-build-page-from-ide-terminal-element' into ↵	Phil Hughes	2019-06-07	2	-9/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE of Part 1] 5276 Remove 'build-page' from 'ide-terminal' element See merge request gitlab-org/gitlab-ce!29331
\| * \| \| \| \| \| \| \| \| \|	Remove 'build-page' from 'ide-terminal' elementce-5276-1-remove-build-page-from-ide-terminal-element	Paul Slaughter	2019-06-07	2	-9/+15
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port Why? The styles applied to `.build-page .top-bar` were mostly unecessary for the IDE terminal. The static positioning might have also been causing a strange line to show up in the terminal.
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue/10088' into 'master'	Filipa Lacerda	2019-06-07	2	-0/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added code differences from EE to CE Closes gitlab-ee#10088 See merge request gitlab-org/gitlab-ce!29271
\| * \| \| \| \| \| \| \| \| \|	added code differences from EE to CE	Michel Engelen	2019-06-07	2	-0/+17
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '62091-remove-time-windows-flag' into 'master'	Nick Thomas	2019-06-07	7	-62/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove metrics_time_window feature flag Closes #62091 See merge request gitlab-org/gitlab-ce!28670
\| * \| \| \| \| \| \| \| \|	Remove metrics_time_window feature flag	Sarah Yasonik	2019-06-07	7	-62/+10
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/ssot-some-ci-section' into 'master'	Achilleas Pipinellis	2019-06-07	12	-118/+285
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSoT audit fixes for some topics in CI section Closes #61505 See merge request gitlab-org/gitlab-ce!28957
\| * \| \| \| \| \| \| \| \|	SSoT audit fixes	Evan Read	2019-06-07	12	-118/+285
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements part of the single source of truth audit fixes for the CI section.