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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-docker-registry-integration' into 'master'	Yorick Peterse	2016-05-21	1	-1/+12
\|\ \| \| \| \| \| \| \| \|	Fix docker registry integration See merge request !4229
\| *	Fix container deletion permission issue	Kamil Trzcinski	2016-05-20	1	-1/+12
\| \|
* \|	Merge branch 'issuable-new-due-date' into 'master'	Jacob Schatz	2016-05-21	1	-1/+59
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuable form due date For some reason, this was never in the original merge request for due date? ![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png) Closes #15516 See merge request !3895
\| *	Fixed rubocop issues	Phil Hughes	2016-05-16	1	-3/+3
\| \|
\| *	Added tests	Phil Hughes	2016-05-16	1	-1/+59
\| \|
* \|	Merge branch 'zj-gitignore-dropdown'	Douwe Maan	2016-05-20	4	-0/+100
\|\ \
\| * \|	Dropdown implementationzj-gitignore-dropdown	Alfredo Sumaran	2016-05-20	1	-0/+1
\| \| \|
\| * \|	Update API and fetching task	Zeger-Jan van de Weg	2016-05-20	2	-3/+5
\| \| \|
\| * \|	Dropdown implementation	Alfredo Sumaran	2016-05-20	1	-0/+30
\| \| \|
\| * \|	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	2	-0/+67
\| \| \|
* \| \|	Merge branch 'rm-source-branch' into 'master'	Douwe Maan	2016-05-20	4	-3/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+27
\| \| \| \|
* \| \| \|	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	Douwe Maan	2016-05-20	8	-7/+102
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/services/system_note_service.rb
\| * \| \| \|	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler	2016-05-18	8	-7/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Diff::InlineDiff
* \| \| \| \|	Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'	Douwe Maan	2016-05-20	4	-25/+144
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Rémy Coutable	2016-05-18	191	-1869/+5078
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \ \ \ \ \	Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-md	Douwe Maan	2016-04-23	36	-273/+614
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Using project `path_with_namespace` in milestone's cross project references ↵	Alejandro Rodríguez	2016-04-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link text
\| * \| \| \| \| \| \|	Escaping the `object_link_text` on cross project milestone references	Alejandro Rodríguez	2016-04-20	1	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Transforming milestones link references to the short reference form	Alejandro Rodríguez	2016-04-20	2	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistently using iid when treating milestones as referrables	Alejandro Rodríguez	2016-04-20	1	-20/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the syntax proposed in #13829 [project_reference]%(milestone_id \| milestone_name) to get a link to the referred milestone.
* \| \| \| \| \| \| \|	Merge branch 'issue_9013' into 'master'	Douwe Maan	2016-05-20	3	-0/+78
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-16/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update documentation	Felipe Artur	2016-05-17	1	-33/+34
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve documentation and add changelog	Felipe Artur	2016-05-17	1	-1/+29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Let users set notification levels in projects which they are not members	Felipe Artur	2016-05-17	4	-2/+56
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue-17537-fix' into 'master'	Douwe Maan	2016-05-20	1	-0/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to non-existent ref Closes #17537
* \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-3055' into 'master'	Douwe Maan	2016-05-20	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3055
* \| \| \| \| \| \| \| \|	Merge branch 'feature/runner-config-untagged-jobs' into 'master'	Robert Speicher	2016-05-19	6	-37/+208
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
\| * \| \| \| \| \| \| \| \|	Minor runner-related code refactorings	Grzegorz Bizon	2016-05-19	2	-11/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Set run untagged option when registering a runner	Grzegorz Bizon	2016-05-19	1	-3/+32
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor CI API specs for creating runner	Grzegorz Bizon	2016-05-19	1	-17/+29
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extend runner options that are configurable via API	Grzegorz Bizon	2016-05-19	1	-4/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add method that check if build has tags	Grzegorz Bizon	2016-05-19	1	-0/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extend CI runners specs	Grzegorz Bizon	2016-05-19	1	-1/+31
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update specs to be valid only for tagged runner	Grzegorz Bizon	2016-05-19	1	-9/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add CI API tests for runner config and untagged jobs	Grzegorz Bizon	2016-05-19	1	-0/+32
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Disallow runner to pick untagged build if configured	Grzegorz Bizon	2016-05-19	1	-11/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extend runner config options for untagged jobs	Grzegorz Bizon	2016-05-19	1	-0/+29
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-ci-commit-creation' into 'master'	Rémy Coutable	2016-05-19	1	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios ## What does this MR do? If we use a new `project.ci_commits` it will add it to array, and some other services which can do a save on a project can lead to a scenario when `ci_commit` will be saved, where it should not be. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/support-forum/issues/717 https://gitlab.com/gitlab-com/support-forum/issues/715 https://gitlab.com/gitlab-org/gitlab-ce/issues/17596 https://gitlab.com/gitlab-com/support-forum/issues/714 https://gitlab.com/gitlab-org/gitlab-ce/issues/13402 cc @rymai See merge request !4214
\| * \| \| \| \| \| \| \| \| \|	Fix creation of Ci::Commit object which can lead to pending, failed in some ↵	Kamil Trzcinski	2016-05-19	1	-0/+16
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scenarios
* \| \| \| \| \| \| \| \| \|	Merge branch 'create-todo-on-failing-build' into 'master'	Douwe Maan	2016-05-19	4	-0/+132
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a todo on failing MR build Implements #14067. I worked on this with @DouweM (any mistakes are mine). When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit. - I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly. See merge request !3177
\| * \| \| \| \| \| \| \| \| \|	Create a todo on failing MR build	Sean McGivern	2016-05-17	4	-0/+132
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit.
* \| \| \| \| \| \| \| \| \|	Merge branch '17464-backport-email-syntax-highlighting' into 'master'	Douwe Maan	2016-05-19	2	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
\| * \| \| \| \| \| \| \| \| \|	Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting	Sean McGivern	2016-05-17	2	-8/+10
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* \| \| \| \| \| \| \| \| \|	Merge branch 'with-pipeline-view' into 'master'	Douwe Maan	2016-05-19	2	-1/+153
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
\| * \| \| \| \| \| \| \| \|	Use pipelines.errors when communicating the error	Kamil Trzcinski	2016-05-18	1	-4/+11
\| \| \| \| \| \| \| \| \| \|