summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-s...Dmitriy Zaporozhets2016-10-241-6/+0
|\
| * Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twit...Dmitriy Zaporozhets2016-10-241-6/+0
* | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-241-0/+5
|\ \ | |/ |/|
| * refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-231-0/+5
* | Expire and build repository cache after project importStan Hu2016-10-231-16/+5
|/
* Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-211-0/+6
|\
| * Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-0/+6
* | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ...Yorick Peterse2016-10-211-1/+7
|\ \ | |/ |/|
| * Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests m...14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-1/+7
* | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-201-8/+8
|\ \
| * | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-201-6/+6
| * | Tests for markdown HipChat notificationsDavid Eisner2016-10-201-6/+6
| * | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-201-10/+10
* | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-201-36/+4
|\ \ \ | |/ / |/| |
| * | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-4/+4
| * | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-32/+0
| |/
* | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status