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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add multiple assignees migration and table population	Oswaldo Ferreira	2019-03-25	4	-0/+129
\| \| \| \|	This will be further required for supporting multi-assignees MRs
*	Set proper default-branch on GitHub Import	Kamil Trzciński	2019-03-22	1	-0/+11
\|
*	Merge branch 'refresh-commit-count-after-head-change' into 'master'	Stan Hu	2019-03-22	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Refresh commit count after repository head changes Closes #59346 See merge request gitlab-org/gitlab-ce!26473
\| *	Refresh commit count after repository head changes	Kamil Trzciński	2019-03-22	1	-0/+6
\| \|
* \|	Freeze strings in email service specs	Sean McGivern	2019-03-22	2	-0/+4
\| \|
* \|	Merge branch 'revert-79a45f7f' into 'master'	Sean McGivern	2019-03-22	102	-145/+144
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'winh-remove-sushi' into 'master'" See merge request gitlab-org/gitlab-ce!26470
\| * \|	Revert "Merge branch 'winh-remove-sushi' into 'master'"	Filipa Lacerda	2019-03-22	102	-145/+144
\| \| \| \| \| \| \| \| \|	This reverts merge request !26430
* \| \|	Merge branch ↵	Robert Speicher	2019-03-22	11	-617/+662
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6618-extract-ee-specific-files-lines-for-create-spec-finders' into 'master' [CE] Extract EE specific files/lines from spec/finders Closes gitlab-ee#10142 and gitlab-ee#10141 See merge request gitlab-org/gitlab-ce!26337
\| * \|	[CE] Reduce differences with EE in users_finder_spec.rb	Rémy Coutable	2019-03-21	4	-49/+38
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	[CE] Reduce differences with EE in snippets_finder_spec.rb	Rémy Coutable	2019-03-21	3	-449/+416
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	[CE] Reduce differences with EE in merge_requests_finder_spec.rb	Rémy Coutable	2019-03-21	2	-93/+109
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	[CE] Reduce differences with EE in issues_finder_spec.rb	Rémy Coutable	2019-03-21	2	-37/+87
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	[CE] Reduce differences with EE in group_projects_finder_spec.rb	Rémy Coutable	2019-03-21	2	-20/+43
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Add highest_role method to User	Thiago Presa	2019-03-22	2	-0/+82
\| \| \|
* \| \|	Merge branch '57540-filename-trailing-space' into 'master'	Tim Zallmann	2019-03-22	1	-0/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implemented trimming for item's name in Web IDE Closes #57540 See merge request gitlab-org/gitlab-ce!26270
\| * \| \|	Implemented trimming for item's name in Web IDE	Denys Mishunov	2019-03-18	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
* \| \| \|	Merge branch 'winh-jest-time' into 'master'	Kushal Pandya	2019-03-22	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mock and wait for timers in Jest Closes #56056 See merge request gitlab-org/gitlab-ce!26433
\| * \| \| \|	Delete dummy test	Winnie Hellmann	2019-03-21	1	-7/+0
\| \| \| \| \|
\| * \| \| \|	Wait for pending timers in Jest	Winnie Hellmann	2019-03-21	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Add dummy test with setTimeout()	Winnie Hellmann	2019-03-21	1	-0/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch '57357-automate-base-domain-help-text' into 'master'	Kushal Pandya	2019-03-22	2	-3/+83
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automate base domain help text on Clusters page Closes #57357 See merge request gitlab-org/gitlab-ce!26124
\| * \| \| \| \|	Update domain help text when ingress is installed	Enrique Alcantara	2019-03-21	1	-1/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When ingress application is installed, the cluster domain help text is updated to indicate that ingress external ip can be used as the cluster domain
\| * \| \| \| \|	Hide/show ingress external ip help text	Enrique Alcantara	2019-03-21	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use not_to instead of to__not
* \| \| \| \| \|	Merge branch 'winh-toggle-comment-draft' into 'master'	Kushal Pandya	2019-03-22	3	-9/+163
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display draft when toggling replies Closes #48211 and #56364 See merge request gitlab-org/gitlab-ce!25563
\| * \| \| \| \| \|	Pass autosaveKey from NoteableDiscussion to NoteForm	Winnie Hellmann	2019-03-21	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Validate NoteForm props in noteable_discussion_spec.js	Winnie Hellmann	2019-03-21	1	-1/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use autosave utilities in NoteForm component	Winnie Hellmann	2019-03-21	1	-8/+86
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add autosave utilities	Winnie Hellmann	2019-03-12	1	-0/+64
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'	Stan Hu	2019-03-22	1	-0/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display the database adapter name in a human-friendly way See merge request gitlab-org/gitlab-ce!26437
\| * \| \| \| \| \| \|	Add helper method to return a human-friendly name for database adapter	Douglas Barbosa Alexandre	2019-03-21	1	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-remove-sushi' into 'master'	Mike Greiling	2019-03-21	102	-144/+145
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430
\| * \| \| \| \| \| \| \|	Remove .raw from JavaScript fixture file names	Winnie Hellmann	2019-03-21	102	-144/+145
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body"
* \| \| \| \| \| \| \|	Merge branch '59147-duplicate-match-line' into 'master'	Douwe Maan	2019-03-21	1	-0/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402
\| * \| \| \| \| \| \| \|	Fix diff bottom expand button appears twice	Mark Chao	2019-03-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default
* \| \| \| \| \| \| \| \|	Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master'	Nick Thomas	2019-03-21	1	-45/+141
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle cases when authorized_keys doesn't exist See merge request gitlab-org/gitlab-ce!26347
\| * \| \| \| \| \| \| \|	Update Gitlab::AuthorizedKeys specs to be clearer	Patrick Bajao	2019-03-21	1	-4/+40
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Handle cases when authorized_keys doesn't exist	Patrick Bajao	2019-03-20	1	-46/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify Gitlab::AuthorizedKeys#rm_key and #list_key_ids to handle cases when an `Errno::ENOENT` is raised. Also added test cases in spec to ensure each method will still work when authorized_keys doesn't exist.
* \| \| \| \| \| \| \| \|	Update merge request widget pipeline block	Nathan Friend	2019-03-21	6	-7/+242
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* \| \| \| \| \| \| \| \|	Merge branch '59289-fix-push-to-create-protected-branches' into 'master'	Douwe Maan	2019-03-21	1	-29/+51
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to create protected branches via CLI Closes #59289 See merge request gitlab-org/gitlab-ce!26413
\| * \| \| \| \| \| \| \|	Allow users to create protected branches via CLI	Patrick Bajao	2019-03-21	1	-29/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for fixing a regression introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24969 This fix will allow users who are allowed to push to protected branches to create protected branches via CLI as well, just like before. The checks for protected branch creation won't need to run.
* \| \| \| \| \| \| \| \|	Merge branch 'revert-1efa9604' into 'master'	James Lopez	2019-03-21	4	-121/+29
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Enrich commits with full data in CommitCollection" See merge request gitlab-org/gitlab-ce!26412
\| * \| \| \| \| \| \| \|	Revert "Merge branch ↵	Sean McGivern	2019-03-21	4	-121/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master'" This reverts merge request !26144
* \| \| \| \| \| \| \| \|	Merge branch 'nfriend-update-job-detail-view-sidebar' into 'master'	Filipa Lacerda	2019-03-21	2	-40/+257
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update job detail view sidebar to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25777
\| * \| \| \| \| \| \| \|	Update job detail sidebar for post-merge pipelines	Nathan Friend	2019-03-20	2	-40/+257
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the job detail view sidebar to accommodate new states introduced as part of the post-merge pipeline feature.
* \| \| \| \| \| \| \|	Merge branch 'osw-multi-line-suggestions-parsing' into 'master'	Grzegorz Bizon	2019-03-21	4	-2/+102
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare multi-line suggestions for rendering in Markdown See merge request gitlab-org/gitlab-ce!26107
\| * \| \| \| \| \| \| \|	Implement multi-line suggestions filtering	Oswaldo Ferreira	2019-03-20	4	-2/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements the filtering logic for `suggestion:-x+y` syntax.
* \| \| \| \| \| \| \| \|	Merge branch 'nfriend-update-pipeline-list-view' into 'master'	Filipa Lacerda	2019-03-21	5	-46/+231
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pipeline list view to accommodate post-merge request pipelines See merge request gitlab-org/gitlab-ce!25690
\| * \| \| \| \| \| \| \| \|	Update pipeline list view	Nathan Friend	2019-03-20	5	-46/+231
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the pipeline page and related components to include new pipeline information added by the post-merge pipeline feature.
* \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2019-03-21	4	-29/+121
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' Enrich commits with full data in CommitCollection Closes #58805 See merge request gitlab-org/gitlab-ce!26144
\| * \| \| \| \| \| \| \| \|	Scope out merge commits in MergeRequest spec	Luke Duncalfe	2019-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the code for excluding merge commits from the commit collection (CommitCollection#without_merge_commits) was not working when the commits had come from a merge request. Now that this has been fixed, these tests fails. They should always have been written to exclude merge commits when comparing.