summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'grapify-labels-api' into 'master' Rémy Coutable2016-10-241-3/+3
|\
| * Grapify the labels APIgrapify-labels-apiRobert Schilling2016-10-241-3/+3
* | Merge branch 'luishgo/gitlab-ce-18898-filter-commits-per-path'Rémy Coutable2016-10-241-0/+11
|\ \
| * | Added path parameter to Commits APILuis HGO2016-10-241-0/+11
* | | fixes build with cache:clear issuetiagonbotelho2016-10-241-0/+1
|/ /
* | Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'Rémy Coutable2016-10-241-2/+13
|\ \
| * | Fix authored vote from notesbarthc2016-10-241-2/+13
* | | Merge branch 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-s...Dmitriy Zaporozhets2016-10-244-8/+93
|\ \ \
| * | | Trigger change even in select2 test helper to produce production-like behaviourDmitriy Zaporozhets2016-10-241-2/+2
| * | | Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| * | | Refactor create member tests from group_members_controller_specDmitriy Zaporozhets2016-10-241-41/+30
| * | | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-242-0/+111
| * | | Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twit...Dmitriy Zaporozhets2016-10-241-6/+0
| |/ /
* | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-241-67/+123
|\ \ \
| * | | Fix branch protection API.Timothy Andrew2016-10-241-67/+123
| | |/ | |/|
* | | Merge branch 'dz-fix-constrainer-for-relative-url' into 'master' Sean McGivern2016-10-241-0/+10
|\ \ \
| * | | Add relative url support to routing contrainersDmitriy Zaporozhets2016-10-241-0/+10
| | |/ | |/|
* | | 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
| | |/ | |/|
* | | Merge branch '#22609' into 'master' Rémy Coutable2016-10-245-4/+0
|\ \ \ | |_|/ |/| |
| * | Move spec/mailers/shared/notify.rb to spec/supportJared Ready2016-10-225-4/+0
* | | Expire and build repository cache after project importStan Hu2016-10-231-16/+5
| |/ |/|
* | Fix status code expectationRémy Coutable2016-10-221-1/+1
* | Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-0/+15
* | Merge branch 'fix-example-in-api-documentation' into 'master' Rémy Coutable2016-10-221-3/+3
|\ \
| * | Fix wrong endpoint in api/users documentation, fix same typo in spec describe...Airat Shigapov2016-10-211-3/+3
* | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-216-0/+128
|\ \ \ | |_|/ |/| |
| * | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-216-0/+128
| |/
* | 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
View Lorry Controller Status