summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
diff options
context:
space:
mode:
authorJarka Košanová <jarka@gitlab.com>2019-01-14 11:46:39 +0100
committerJarka Košanová <jarka@gitlab.com>2019-02-14 15:28:02 +0100
commit30ab6ee416783cd9481085f021603383eeb4f317 (patch)
tree4d4f9eee50812ff132125859860077e6364ecb4e /app/services/merge_requests
parent66b20a66f4b25a69ff3f59da855ac2cb38c8bca9 (diff)
downloadgitlab-ce-30ab6ee416783cd9481085f021603383eeb4f317.tar.gz
Check issue milestone availability
Add project when creating milestone in specs We validate milestone is from the same project/parent group as issuable -> we need to set project in specs correctly Improve methods names and specs organization
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/build_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 48419da98ad..109c964e577 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -19,6 +19,7 @@ module MergeRequests
merge_request.target_project = find_target_project
merge_request.target_branch = find_target_branch
merge_request.can_be_created = projects_and_branches_valid?
+ ensure_milestone_available(merge_request)
# compare branches only if branches are valid, otherwise
# compare_branches may raise an error