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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_14189' into 'master'	Jacob Schatz	2016-06-07	1	-2/+27
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Ability to prioritize labels Closes #14189 See merge request !4009
\| *	add :set_priorities to :authorize_admin_labels!	Alfredo Sumaran	2016-06-06	1	-1/+1
\| \|
\| *	Remove unnecesary param	Alfredo Sumaran	2016-06-06	1	-1/+1
\| \|
\| *	Update method and route	Alfredo Sumaran	2016-06-06	1	-2/+2
\| \|
\| *	Add unprioritized scope	Alfredo Sumaran	2016-06-06	1	-2/+2
\| \|
\| *	Improve Issuable.order_labels_priority	Rémy Coutable	2016-06-06	1	-5/+10
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Sort by label priority	Thijs Wouters	2016-06-06	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Prioritize labels functionality	Alfredo Sumaran	2016-06-06	1	-1/+21
\| \|
* \|	Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format	Jacob Vosmaer (GitLab)	2016-06-07	1	-3/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
\| * \|	Workhorse to serve raw diffs	Zeger-Jan van de Weg	2016-06-03	1	-3/+10
\| \| \|
* \| \|	Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3	Kamil Trzcinski	2016-06-07	1	-4/+4
\| \| \|
* \| \|	Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3	Kamil Trzcinski	2016-06-06	1	-0/+3
\|\ \ \
\| * \ \	Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2	Kamil Trzcinski	2016-06-06	1	-0/+3
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge branch 'notes-are-awardables' into 'master'	Douwe Maan	2016-06-06	1	-0/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291
\| \| \| * \|	Backend awardables on comments	ZJ van de Weg	2016-06-06	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3	Kamil Trzcinski	2016-06-06	3	-6/+6
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Use `@ci_commit` in merge_request_controller	Kamil Trzcinski	2016-06-06	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	2	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/builds_spec.rb
\| \| * \| \|	Merge branch 'fix/unauthorized-access-to-build-data' into 'master'	Douwe Maan	2016-06-06	2	-2/+2
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 'unscoped' from project builds selection This is a fix for this security bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/18188 /cc @kamil @grzegorz @stanhu See merge request !1968
\| \| \| * \|	Remove 'unscoped' from project builds selection	Tomasz Maczukin	2016-06-04	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3	Kamil Trzcinski	2016-06-06	3	-33/+28
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	3	-33/+28
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Respond to .json only	Alfredo Sumaran	2016-06-03	1	-1/+6
\| \| \| \| \|
\| \| * \| \|	WIP: allow adding and removing labels in bulk	Sean McGivern	2016-06-03	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	Add label_ids to bulk_update_params	Alfredo Sumaran	2016-06-03	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Ability to assign a label to multiple issues	Alfredo Sumaran	2016-06-03	1	-1/+2
\| \| \|/ /
\| \| * \|	Merge branch 'master' into awardablesawardables	Z.J. van de Weg	2016-06-03	5	-31/+37
\| \| \|\ \ \| \| \| \|/
\| \| * \|	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-30	2	-3/+3
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-25	4	-5/+89
\| \| \|\ \ \
\| \| * \| \| \|	Fix backend merge mistakes	ZJ van de Weg	2016-05-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \|	Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-18	1	-4/+9
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Fix latests concerns	ZJ van de Weg	2016-05-18	1	-4/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-18	1	-0/+34
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-18	10	-19/+30
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
\| \| * \| \| \| \| \|	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	1	-2/+4
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	13	-77/+109
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Add tests on Awardables and Award Emoji	Zeger-Jan van de Weg	2016-05-10	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Create table for award emoji	Zeger-Jan van de Weg	2016-05-06	3	-31/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix tests offenses: use `pipeline` of Ci::Build and rename views	Kamil Trzcinski	2016-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Rename all ci_commit[s] in application code to pipeline[s]	Kamil Trzcinski	2016-06-03	2	-6/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit	Kamil Trzcinski	2016-06-03	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
\| * \| \| \| \| \| \| \|	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	Douwe Maan	2016-06-03	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI: ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif) @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh :smiley: Closes #14139. See merge request !4414
\| \| * \| \| \| \| \| \| \|	Don't allow merges with new commits	Sean McGivern	2016-06-01	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
* \| \| \| \| \| \| \| \| \|	Fix other places where we still use commit attribute of Build	Kamil Trzcinski	2016-06-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Update tests to match new Code tab logic	Dmitriy Zaporozhets	2016-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Put project Files and Commits tabs under Code tab	Dmitriy Zaporozhets	2016-06-03	1	-1/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline	Kamil Trzcinski	2016-06-02	4	-17/+17
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'separate-banzai-references' into 'master'	Douwe Maan	2016-06-01	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
\| * \| \| \| \| \| \| \|	Split Markdown rendering & reference gathering	Yorick Peterse	2016-05-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.