summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-201-10/+10
* Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-201-3/+11
|\
| * Create project feature when project is createdissue_22944Felipe Artur2016-10-191-3/+11
* | Differentiate the expire from leave eventCallum Dryden2016-10-203-0/+69
|/
* Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-196-56/+254
|\
| * Add subject to group and projects labels which return group/projectDouglas Barbosa Alexandre2016-10-192-0/+16
| * Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-191-0/+58
| * Add restriction to number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-1/+12
| * Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-191-1/+0
| * Add LabelPriority modelDouglas Barbosa Alexandre2016-10-192-0/+22
| * Fix validation to allow updates to description/color of project labelDouglas Barbosa Alexandre2016-10-191-0/+10
| * Unfold references for group labels when moving issue to another projectDouglas Barbosa Alexandre2016-10-193-46/+74
| * Validate if project label title does not exist at group levelDouglas Barbosa Alexandre2016-10-192-1/+35
| * Add ProjectLabel modelDouglas Barbosa Alexandre2016-10-193-29/+36
| * Validates uniqueness of title unless label is a templateDouglas Barbosa Alexandre2016-10-191-0/+1
| * Add GroupLabel modelDouglas Barbosa Alexandre2016-10-192-0/+12
* | Merge branch 'issue_828' into 'master' Douwe Maan2016-10-193-15/+17
|\ \ | |/ |/|
| * Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-193-15/+17
* | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-17/+41
|\ \ | |/ |/|
| * Extend merge request tests for all commits methodGrzegorz Bizon2016-10-181-17/+41
* | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-0/+116
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-184-11/+46
| |\ \
| * | | Fix remaining offensesKamil Trzcinski2016-10-181-3/+4
| * | | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-0/+37
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-6/+6
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-171-18/+9
| |\ \ \ \
| * | | | | Fix specsKamil Trzcinski2016-10-171-1/+1
| * | | | | Work on specsKamil Trzcinski2016-10-172-0/+78
* | | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-182-1/+183
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-183-25/+16
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Just show the first merge request we found, feedback:Lin Jen-Shin2016-10-142-39/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1420-171/+338
| |\ \ \ \ \
| * | | | | | Introduce Pipeline#merge_requests_with_active_first,Lin Jen-Shin2016-10-142-1/+40
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0815-58/+356
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0418-98/+635
| |\ \ \ \ \ \ \
| * | | | | | | | Fix test by having a real commitLin Jen-Shin2016-09-231-1/+5
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2117-26/+834
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1934-562/+276
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-143-0/+157
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test for realLin Jen-Shin2016-09-141-34/+82
| * | | | | | | | | | | Fix pipeline emails and add testsLin Jen-Shin2016-09-141-0/+130
* | | | | | | | | | | | Merge branch 'retry-cancelled-pipelines' into 'master' Kamil Trzciński2016-10-181-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelinesLin Jen-Shin2016-10-183-25/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Make cancelled pipelines being able to retryLin Jen-Shin2016-10-171-5/+19
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_19734_2' into 'master' Sean McGivern2016-10-181-1/+22
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue_19734_2Phil Hughes2016-10-181-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-1/+22
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'looser-time-in-specs' into 'master' Douwe Maan2016-10-182-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add a be_like_time matcher and use it in specsNick Thomas2016-10-172-5/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-172-19/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /