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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix behavior around commands with optional arguments4273-slash-commands	Douwe Maan	2016-08-18	5	-42/+63
\|
*	Fix behavior of label_ids and add/remove_label_ids	Douwe Maan	2016-08-18	1	-7/+8
\|
*	Remove unneeded aliases	Douwe Maan	2016-08-18	8	-117/+109
\|
*	Address feedback	Douwe Maan	2016-08-17	4	-23/+19
\|
*	Fix specs and implement fixes based on failing specs	Douwe Maan	2016-08-17	11	-84/+75
\|
*	Merge branch 'master' into 4273-slash-commands	Douwe Maan	2016-08-16	238	-892/+4066
\|\ \| \| \| \| \| \| \| \|	# Conflicts: # app/services/issues/create_service.rb
\| *	Merge branch 'project-list-icons-width' into 'master'	Jacob Schatz	2016-08-16	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed width on project visibility icon in project list ## What does this MR do? Gives fixed width to the project visibility icons in the project list so that they all correctly line up with each other. ## What are the relevant issue numbers? Closes #19583 ## Screenshots (if relevant) ![Screen_Shot_2016-07-07_at_12.49.58](/uploads/bffa097c5c0e0a1339bbd4d7ea15d84f/Screen_Shot_2016-07-07_at_12.49.58.png) See merge request !5137
\| \| *	Fixed width on project visibility icon in project listproject-list-icons-width	Phil Hughes	2016-07-07	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #19583
\| * \|	Merge branch 'pipeline-hooks-without-slack' into 'master'	Robert Speicher	2016-08-16	50	-111/+609
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement pipeline hooks, extracted from !5525 Closes #20115 See merge request !5620
\| \| * \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2016-08-16	107	-436/+1984
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pipeline-hooks-without-slack
\| \| * \| \|	Revert unrelevant changespipeline-hooks-without-slack	Kamil Trzcinski	2016-08-16	3	-22/+18
\| \| \| \| \|
\| \| * \| \|	Make rubocop happy	Kamil Trzcinski	2016-08-15	1	-9/+9
\| \| \| \| \|
\| \| * \| \|	Merge branch 'fix-failing-tests' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-15	31	-221/+853
\| \| \|\ \ \
\| \| * \ \ \	Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-15	58	-131/+619
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-13	26	-50/+237
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Make explicit call for all event types for ProjectHook factory	Kamil Trzcinski	2016-08-12	1	-9/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Capitalise URL on web_hooks/form	Kamil Trzcinski	2016-08-12	1	-8/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove changes not related to this MR	Kamil Trzcinski	2016-08-12	3	-5/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added documentation for pipeline hooks	Kamil Trzcinski	2016-08-12	1	-0/+168
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename queue to enqueue in tests	Kamil Trzcinski	2016-08-12	4	-7/+11
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-12	8	-34/+39
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Fix test failures	Kamil Trzcinski	2016-08-12	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Make pipeline to be in created state for hooks tests	Kamil Trzcinski	2016-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Make `execute_methods` public	Kamil Trzcinski	2016-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-12	42	-329/+545
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/ci/pipeline.rb # app/models/commit_status.rb # app/services/ci/create_pipeline_service.rb # spec/models/ci/pipeline_spec.rb
\| \| * \| \| \| \| \| \| \|	Fix tests. We cannot reload unless it's already saved:	Lin Jen-Shin	2016-08-12	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure if this is the right fix... Or maybe we should actually merge: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5782
\| \| * \| \| \| \| \| \| \|	Have trait all_events_enabled so that's easier to reuse, feedback:	Lin Jen-Shin	2016-08-12	2	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13823349
\| \| * \| \| \| \| \| \| \|	Simplify the name for data builder, feedback:	Lin Jen-Shin	2016-08-12	32	-63/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
\| \| * \| \| \| \| \| \| \|	Prefer extend self over module_function, feedback:	Lin Jen-Shin	2016-08-12	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13672004 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810498
\| \| * \| \| \| \| \| \| \|	Make it more grammatically correct, feedback:	Lin Jen-Shin	2016-08-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13811203
\| \| * \| \| \| \| \| \| \|	if -> when; when -> `when`; %w() -> %w[]; and fix some typos:	Lin Jen-Shin	2016-08-12	1	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810945
\| \| * \| \| \| \| \| \| \|	Prefer described_class, feedback:	Lin Jen-Shin	2016-08-12	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810811 And other similar places.
\| \| * \| \| \| \| \| \| \|	Make the comment more clear, feedback:	Lin Jen-Shin	2016-08-12	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810778
\| \| * \| \| \| \| \| \| \|	Fix tests for pipeline events	Kamil Trzcinski	2016-08-11	2	-18/+50
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix pipeline status change from pending to running	Kamil Trzcinski	2016-08-11	3	-1/+53
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Enhance a pipeline event tests to analyse number of returned builds	Kamil Trzcinski	2016-08-11	2	-22/+25
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove stage parameter from send payload	Kamil Trzcinski	2016-08-11	3	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack	Kamil Trzcinski	2016-08-11	102	-2578/+3048
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/ci/pipeline.rb # app/services/ci/create_pipeline_service.rb # spec/models/project_services/hipchat_service_spec.rb
\| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack	Lin Jen-Shin	2016-08-11	591	-5159/+8109
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (233 commits) Fix awardable button mutuality loading spinners Update CHANGELOG for 8.10.5 Clean up project destruction Small refactor of doc/development/README.md Avoid commit lookup on diff_helper Removed extra newline from redis_spec.rb Used cached value of project count to reduce DB load Remove duplicate link_to statements Mention add_column_with_default in downtime guide Add missing space to generic badge template Rename `run` task helper method to prevent conflict with StateMachine Add a method in Project to return a cached value of total count of projects spellcheck Add svg guidelines to ui guide Add Changelog entry for Grape upgrade [ci skip] Fix Grape tests. Retain old behavior Update Grape from 0.13.0 to 0.15.0. adds second batch of tests changed to active tense fixes part1 of files to start using active tense ...
\| \| * \| \| \| \| \| \| \| \| \|	Let's make sure cache were cleared:	Lin Jen-Shin	2016-08-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I can't reproduce this failure locally. Here's the failure: https://gitlab.com/gitlab-org/gitlab-ce/builds/2864250
\| \| * \| \| \| \| \| \| \| \| \|	We still need to skip loading config_processor if skip_ci?	Lin Jen-Shin	2016-08-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	No need to check that as in CreateCommitBuildsService:	Lin Jen-Shin	2016-08-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13581358
\| \| * \| \| \| \| \| \| \| \| \|	Define utility functions later, feedback:	Lin Jen-Shin	2016-08-05	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13581143
\| \| * \| \| \| \| \| \| \| \| \|	Share nothing so it's safest, feedback:	Lin Jen-Shin	2016-08-05	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13581090
\| \| * \| \| \| \| \| \| \| \| \|	Touch it after builds were created, aligning with:	Lin Jen-Shin	2016-08-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CreateCommitBuildsService
\| \| * \| \| \| \| \| \| \| \| \|	Removed the abstract let, feedback:	Lin Jen-Shin	2016-08-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13580861
\| \| * \| \| \| \| \| \| \| \| \|	Missed renaming them	Lin Jen-Shin	2016-08-05	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move those builders to their own namespace, feedback:	Lin Jen-Shin	2016-08-04	28	-44/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
\| \| * \| \| \| \| \| \| \| \| \|	Separate the concern for executing hooks and updating states	Lin Jen-Shin	2016-08-04	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Revert "We don't have to touch it because builds would touch pipeline anyway"	Lin Jen-Shin	2016-08-04	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3691a391524911a21d5af1c75cb4cd16a8a6e475.