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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update CHANGELOGfix-docker-registry-integration	Kamil Trzcinski	2016-05-21	1	-0/+1
\|
*	Fix container deletion permission issue	Kamil Trzcinski	2016-05-20	3	-3/+14
\|
*	Merge branch 'zj-gitignore-dropdown'	Douwe Maan	2016-05-20	196	-41/+4141
\|\
\| *	Dropdown implementationzj-gitignore-dropdown	Alfredo Sumaran	2016-05-20	11	-76/+97
\| \|
\| *	Update API and fetching task	Zeger-Jan van de Weg	2016-05-20	4	-41/+51
\| \|
\| *	Dropdown implementation	Alfredo Sumaran	2016-05-20	7	-20/+96
\| \|
\| *	First import of gitignores	Zeger-Jan van de Weg	2016-05-20	181	-5/+3780
\| \| \| \| \| \| \| \| \| \| \| \|	Add .gitignore dropdown when creating a new .gitignore file Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
\| *	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	11	-9/+227
\| \|
* \|	Merge branch 'rm-source-branch' into 'master'	Douwe Maan	2016-05-20	14	-14/+75
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
\| * \|	Allows MR authors to have the source branch removed when merging the MR	Jeroen Jacobs	2016-05-20	14	-14/+75
\| \| \|
* \| \|	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	Douwe Maan	2016-05-20	19	-38/+192
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/services/system_note_service.rb
\| * \| \|	Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-rename	Rémy Coutable	2016-05-18	3	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Add documentation for Inline Diff	Rémy Coutable	2016-05-18	2	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler	2016-05-18	18	-38/+172
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Diff::InlineDiff
* \| \| \|	Merge branch 'issue_14684_2' into 'master'	Douwe Maan	2016-05-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	current_user.confirmed_at.present? => current_user.confirmed? fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41 See merge request !4225
\| * \| \| \|	current_user.confirmed_at.present? => current_user.confirmed?issue_14684_2	Felipe Artur	2016-05-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'	Douwe Maan	2016-05-20	11	-47/+281
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
\| * \| \| \| \|	Address Yorick's feedbackeReGeBe/gitlab-ce-feature/milestone-md	Rémy Coutable	2016-05-18	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Rémy Coutable	2016-05-18	767	-6387/+11431
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Fix cross-project milestone ref with invalid project	Douwe Maan	2016-04-23	1	-11/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move changelog item	Douwe Maan	2016-04-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-md	Douwe Maan	2016-04-23	162	-3280/+2290
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Update CHANGELOG	Alejandro Rodríguez	2016-04-20	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Include Milestone reference syntax in Markdown documentation	Alejandro Rodríguez	2016-04-20	1	-14/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Using project `path_with_namespace` in milestone's cross project references ↵	Alejandro Rodríguez	2016-04-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link text
\| * \| \| \| \| \| \|	Inserting the Milestone title between quotes on GFM auto complete	Alejandro Rodríguez	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is due to the fact that for multiple word titles it might be an invalid reference without the quotes
\| * \| \| \| \| \| \|	Sorting Milestones on the auto complete list by due date and title	Alejandro Rodríguez	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Inserting Milestone titles insted of IIDs with GFM auto complete	Alejandro Rodríguez	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Matching version-like expressions as `milestone_name`s instead of ↵	Alejandro Rodríguez	2016-04-20	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`milestone_iid`s The changes also account for %2.1. being matched as milestone_name = "2.1" without the word-separating dot.
\| * \| \| \| \| \| \|	Implementing autocomplete for GFM milestone references	Alejandro Rodríguez	2016-04-20	3	-0/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Escaping the `object_link_text` on cross project milestone references	Alejandro Rodríguez	2016-04-20	2	-1/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Transforming milestones link references to the short reference form	Alejandro Rodríguez	2016-04-20	3	-1/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistently using iid when treating milestones as referrables	Alejandro Rodríguez	2016-04-20	3	-32/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, addint a suffix to the reference text when the milestone is in another project
\| * \| \| \| \| \| \|	Implementing special GitLab markdown reference for milestones	Alejandro Rodríguez	2016-04-20	5	-14/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the syntax proposed in #13829 [project_reference]%(milestone_id \| milestone_name) to get a link to the referred milestone.
* \| \| \| \| \| \| \|	Merge branch 'issue_14632' into 'master'	Douwe Maan	2016-05-20	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group visibility level migration in case all visibility levels are restricted fixes #14632 See merge request !4107
\| * \| \| \| \| \| \| \|	Fix group visibility level migration in case all visibility levels are ↵issue_14632	Felipe Artur	2016-05-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	restricted
* \| \| \| \| \| \| \| \|	Merge branch 'issue_9013' into 'master'	Douwe Maan	2016-05-20	6	-8/+81
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let users set notification levels in projects which they are not members Fixes #9013 See merge request !3986
\| * \| \| \| \| \| \| \|	Use the right default notification settings for non membersissue_9013	Felipe Artur	2016-05-19	4	-23/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update documentation	Felipe Artur	2016-05-17	4	-35/+37
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve documentation and add changelog	Felipe Artur	2016-05-17	3	-10/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Let users set notification levels in projects which they are not members	Felipe Artur	2016-05-17	6	-6/+65
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue-17537-fix' into 'master'	Douwe Maan	2016-05-20	3	-4/+27
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref Closes #17537 See merge request !4151
\| * \| \| \| \| \| \| \| \|	Fix Error 500 when attempting to retrieve project license when HEAD points ↵	Stan Hu	2016-05-14	3	-4/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to non-existent ref Closes #17537
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-3055' into 'master'	Douwe Maan	2016-05-20	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use extended regexp flag for `git grep`-ing files Closes #3055 See merge request !4203
\| * \| \| \| \| \| \| \| \|	Use extended regexp flag for `git grep`-ing filesrs-issue-3055	Robert Speicher	2016-05-18	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3055
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/url-refactor-from-ee' into 'master'	Robert Speicher	2016-05-20	1	-8/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CE code to include some refactor done in EE to do with import url This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only. See merge request !4223
\| * \| \| \| \| \| \| \| \| \|	refactor project to include some nicer EE stufffix/url-refactor-from-ee	James Lopez	2016-05-20	1	-8/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-db-schema' into 'master'	Jeroen van Baarsen	2016-05-20	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the DB schema This updates `db/schema.rb` which apparently wasn't fully updated in the recent merge requests. See merge request !4222
\| * \| \| \| \| \| \| \| \|	Updated the DB schema	Yorick Peterse	2016-05-19	1	-3/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'feature/runner-config-untagged-jobs' into 'master'	Robert Speicher	2016-05-19	22	-98/+314
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039