summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-211-0/+12
|\
| * Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-0/+12
* | 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 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-212-0/+47
|\ \ \
| * | | Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-212-0/+47
* | | | 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 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-201-25/+28
|\ \ \ \
| * | | | Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-201-25/+28
| | |_|/ | |/| |
* | | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-201-1/+1
|\ \ \ \
| * | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
* | | | | Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-203-15/+13
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-208-15/+169
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-203-15/+13
| | |_|/ / | |/| | |
* | | | | 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-202-36/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-4/+4
| * | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-0/+14
| * | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-32/+0
| |/ / /
* | | | Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-201-10/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | Restrict ProjectCacheWorker jobs to one per 15 minproject-cache-worker-leaseYorick Peterse2016-10-201-10/+28
* | | | Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
|\ \ \ \
| * | | | Make label API spec independent of orderDouwe Maan2016-10-201-2/+1
| |/ / /
* | | | 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-205-0/+129
|/ /
* | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-1932-156/+874
|\ \
| * | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-191-12/+17
| * | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Update specs to cope with new label types and prioritiesJames Lopez2016-10-196-9/+51
| * | Fix GitHub importer specDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Add service to create project labelsDouglas Barbosa Alexandre2016-10-191-0/+51
| * | Recreates the label priorities when moving project to another groupDouglas Barbosa Alexandre2016-10-191-0/+10
| * | 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
| * | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-192-12/+29
| * | 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-192-5/+4
| * | Add LabelPriority modelDouglas Barbosa Alexandre2016-10-193-0/+29
| * | List all available labels to the project on the labels APIDouglas Barbosa Alexandre2016-10-191-3/+9
| * | Add support to group labels on issues board APIDouglas Barbosa Alexandre2016-10-191-8/+17
| * | Fix validation to allow updates to description/color of project labelDouglas Barbosa Alexandre2016-10-191-0/+10
| * | Reuse LabelsFinder on Issueable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-191-3/+4
| * | fix rubocop warningJames Lopez2016-10-191-2/+4
| * | Fix import/export labels to cope with project and group labels. Added relevan...James Lopez2016-10-193-6/+66