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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add db:migrate task to CItest-db-migrate	Dmitriy Zaporozhets	2016-04-21	1	-0/+5
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'fix/label-filters' into 'master'	Douwe Maan	2016-04-21	4	-31/+62
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
\| *	refactored specs based on feedbackfix/label-filters	James Lopez	2016-04-21	2	-31/+18
\| \|
\| *	use wait_for_ajax instead of sleeping for 2 days!	James Lopez	2016-04-21	1	-10/+12
\| \|
\| *	refactored specs, adding more scenarios	James Lopez	2016-04-21	2	-22/+34
\| \|
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters	James Lopez	2016-04-21	218	-725/+5866
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/issues/filter_by_labels_spec.rb
\| * \|	final line missing	James Lopez	2016-04-20	1	-1/+1
\| \| \|
\| * \|	fix rubocop warning	James Lopez	2016-04-20	1	-2/+2
\| \| \|
\| * \|	udpated a few things based on MR feedback. Also added model spec	James Lopez	2016-04-20	5	-176/+203
\| \| \|
\| * \|	fix other spec failures	James Lopez	2016-04-19	1	-1/+1
\| \| \|
\| * \|	filter labels by including all filter titles as part of the query	James Lopez	2016-04-19	3	-2/+172
\| \| \|
* \| \|	Merge branch 'revert-sentry-js' into 'master'	Jacob Schatz	2016-04-21	5	-2482/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sentry-js' into 'master'" This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab. See merge request !3851
\| * \| \|	Revert changelog too	Jacob Schatz	2016-04-21	1	-1/+0
\| \| \| \|
\| * \| \|	Revert "Merge branch 'sentry-js' into 'master' "	Jacob Schatz	2016-04-21	4	-2481/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
* \| \| \|	Merge branch 'top-navigation-concept' into 'master'	Dmitriy Zaporozhets	2016-04-21	16	-24/+30
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
\| * \| \|	Layout navigation should respect layout width settingstop-navigation-concept	Dmitriy Zaporozhets	2016-04-20	2	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Fix tests and remove counters	Dmitriy Zaporozhets	2016-04-19	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Implement top navigation concept for profile area	Dmitriy Zaporozhets	2016-04-19	16	-22/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'document-feature-freeze' into 'master'	Douwe Maan	2016-04-21	1	-0/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the feature freeze starting on the 18th cc @dzaporozhets @rspeicher @DouweM @rymai @axil See merge request !3698
\| * \| \| \|	Document the feature freeze of stable branchesdocument-feature-freeze	Yorick Peterse	2016-04-18	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#15183
* \| \| \| \|	Merge branch 'issue_5838' into 'master'	Rémy Coutable	2016-04-21	8	-16/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show project members only for members fixes #5838 See merge request !3752
\| * \| \| \| \|	Add changelog entry and fix convention in a specissue_5838	Felipe Artur	2016-04-20	2	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused authorization from controller	Felipe Artur	2016-04-20	3	-8/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Projects members tab should follow visibility levels	Felipe Artur	2016-04-18	5	-39/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Show project members only for members	Felipe Artur	2016-04-18	5	-3/+49
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-pg-trgrm-in-migration' into 'master'	Yorick Peterse	2016-04-21	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempt to create pg_trgm extension in migration for test/dev environments See merge request !3805
\| * \| \| \| \| \|	Attempt to create pg_trgm extension in migration for test/dev environments	Stan Hu	2016-04-20	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15210
* \| \| \| \| \| \|	Merge branch 'fix/cross-project-labels-project-reference' into 'master'	Grzegorz Bizon	2016-04-21	3	-31/+48
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
\| * \| \| \| \| \| \|	Refactor banzai code that finds cross-project labels	Grzegorz Bizon	2016-04-21	1	-15/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Changelog entry for cross-project label fix	Grzegorz Bizon	2016-04-21	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix cross-project label ref with invalid project	Grzegorz Bizon	2016-04-21	2	-17/+27
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15168
* \| \| \| \| \| \|	Merge branch 'addtap' into 'master'	Kamil Trzciński	2016-04-21	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add tap coverage example to project settings Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap) Before: ![Screen_Shot_2016-04-07_at_9.57.32_AM](/uploads/2864d4cd4b5288565057263a435a851f/Screen_Shot_2016-04-07_at_9.57.32_AM.png) After: ![Screen_Shot_2016-04-07_at_9.57.16_AM](/uploads/62901e01c4ad6db86e4ced3dfebd20b9/Screen_Shot_2016-04-07_at_9.57.16_AM.png) See merge request !3597
\| * \| \| \| \| \| \|	add tap coverage example to project settings	Evan Lucas	2016-04-19	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap)
* \| \| \| \| \| \| \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	53	-473/+646
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline	Kamil Trzcinski	2016-04-19	122	-523/+1840
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \|	Fix CHANGELOG	Kamil Trzcinski	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix rubocop	Kamil Trzcinski	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix tests	Kamil Trzcinski	2016-04-18	4	-27/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make some logic less twistable	Kamil Trzcinski	2016-04-17	6	-10/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Write specs for this feature	Kamil Trzcinski	2016-04-16	7	-19/+188
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert unneeded changes	Kamil Trzcinski	2016-04-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename CiStatus to Statusable	Kamil Trzcinski	2016-04-16	7	-9/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	199	-810/+3167
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \|	Fix implementation of config_processor and ci_yaml_file	Kamil Trzcinski	2016-04-13	1	-10/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update handling of skipped status	Kamil Trzcinski	2016-04-13	3	-17/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify state update of Ci::Commit object	Kamil Trzcinski	2016-04-13	1	-61/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Support skipped status	Kamil Trzcinski	2016-04-13	2	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Optimise Merge Request builds rendering	Kamil Trzcinski	2016-04-13	3	-6/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix migrations on MySQL	Kamil Trzcinski	2016-04-13	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update db/schema.rb	Kamil Trzcinski	2016-04-13	1	-1/+8
\| \| \| \| \| \| \| \| \| \|