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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix/label-filters' into 'master'	Douwe Maan	2016-04-21	1	-1/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters	James Lopez	2016-04-21	22	-57/+232
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/issues/filter_by_labels_spec.rb
\| * \|	udpated a few things based on MR feedback. Also added model spec	James Lopez	2016-04-20	1	-1/+8
\| \| \|
\| * \|	filter labels by including all filter titles as part of the query	James Lopez	2016-04-19	1	-1/+1
\| \| \|
* \| \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	7	-145/+173
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-26/+74
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Fix tests	Kamil Trzcinski	2016-04-18	1	-1/+1
\| \| \| \|
\| * \| \|	Make some logic less twistable	Kamil Trzcinski	2016-04-17	1	-1/+1
\| \| \| \|
\| * \| \|	Write specs for this feature	Kamil Trzcinski	2016-04-16	3	-12/+16
\| \| \| \|
\| * \| \|	Rename CiStatus to Statusable	Kamil Trzcinski	2016-04-16	4	-6/+10
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	10	-39/+112
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-13	12	-111/+75
\| \|\ \ \ \
\| * \| \| \| \|	Fix CiStatus implementation and tests	Kamil Trzcinski	2016-04-13	2	-11/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Remove the use of default scope for Builds	Kamil Trzcinski	2016-04-13	1	-11/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Optimise CI status accessor	Kamil Trzcinski	2016-04-12	2	-41/+22
\| \| \| \| \| \|
\| * \| \| \| \|	Optimise CI status accessor	Kamil Trzcinski	2016-04-12	3	-1/+41
\| \| \| \| \| \|
\| * \| \| \| \|	Fix create_next_builds method	Kamil Trzcinski	2016-04-12	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fix rest of rspec and spinach tests	Kamil Trzcinski	2016-04-12	2	-7/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Fix specs	Kamil Trzcinski	2016-04-11	3	-14/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Use Ci::Commit as Pipeline	Kamil Trzcinski	2016-04-11	7	-106/+144
\| \| \| \| \| \|
* \| \| \| \| \|	Move Issue scopes from Issuable to Issue model	Rémy Coutable	2016-04-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Move due_date sort scopes to Issue and fix CHANGELOG	Rémy Coutable	2016-04-20	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Address MR feedback	Rémy Coutable	2016-04-20	3	-17/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Add red color to overdue and open issues	Mehmet Beydogan	2016-04-20	1	-0/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Fix functionality of due this week. Add due this month and overdue, remove ↵	Mehmet Beydogan	2016-04-20	3	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	due tomorrow to issues. Fix typos on sorting dropdown related to due date Remove constant array and add Structs on Issue to keep due date data to fill options
* \| \| \| \| \|	Update due date asc scope for mysql	Mehmet Beydogan	2016-04-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Add due_date:time field to Issue model	Mehmet Beydogan	2016-04-20	3	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add due_date text field to sidebar issue#show Add ability sorting issues by due date ASC and DESC Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options Add handling issue due_date field for MergeRequest Update CHANGELOG Fix ambigous match for issues#show sidebar Fix SCREAMING_SNAKE_CASE offenses for due date contants Add specs for due date sorting and filtering on issues
* \| \| \| \| \|	Merge branch 'multi-filter-labels' into 'master'	Jacob Schatz	2016-04-20	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mutliple label filter Fixes #989 See merge request !3438
\| * \| \| \| \| \|	Label text color comes from JSON	Phil Hughes	2016-04-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created issuable singleton to house the filtering
* \| \| \| \| \| \|	Verify the MR being displayed question has a merge commit set and can be ↵	Douwe Maan	2016-04-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-picked
* \| \| \| \| \| \|	Fix Build#append_trace method usage when trace file doesn't exists yet	Tomasz Maczukin	2016-04-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make sure that appending is done on a valid length	Tomasz Maczukin	2016-04-20	1	-4/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add range checking	Tomasz Maczukin	2016-04-20	1	-0/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add incremental build trace update API	Tomasz Maczukin	2016-04-20	1	-1/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'slack_wiki_notifications' into 'master'	Rémy Coutable	2016-04-20	5	-2/+65
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
\| * \| \| \| \| \| \|	formatting and test structure	Sebastian Klier	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add slack notifications for wiki pages	Sebastian Klier	2016-04-20	5	-2/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog
* \| \| \| \| \| \| \|	Merge branch 'license-templates-and-api-12804' into 'master'	Robert Speicher	2016-04-20	1	-19/+18
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
\| * \| \| \| \| \| \|	Continue implementation of the license template selector and /licenses API ↵	Rémy Coutable	2016-04-18	1	-19/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '15139-fix-constants-redefinition-warnings' into 'master'	Robert Speicher	2016-04-19	9	-13/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define constants only if not defined yet and freeze them Fixes #15139. See merge request !3810
\| * \| \| \| \| \| \| \|	Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warnings	Rémy Coutable	2016-04-19	3	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Remove useless require 'file_size_validator' causing warnings	Rémy Coutable	2016-04-19	6	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Define constants only if not defined yet and freeze them	Rémy Coutable	2016-04-19	1	-3/+3
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'pmq20/gitlab-ce-issue_12785'	Douwe Maan	2016-04-19	2	-5/+52
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add support to cherry-pick any commit	P.S.V.R	2016-04-18	2	-5/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* \| \| \| \| \| \| \| \|	Merge branch 'mr-formatting' into 'master'	Robert Speicher	2016-04-19	3	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740