diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 21:37:15 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 21:37:15 +0300 |
| commit | 025015048f7eaad29ee7816c6040fb3e0c06eb8d (patch) | |
| tree | 50d713b293ffd0dee44b715dd9c12621810f8fa5 /app/services/merge_requests | |
| parent | 6683298fe6d85bb0785906723663482798418907 (diff) | |
| parent | 30ab6ee416783cd9481085f021603383eeb4f317 (diff) | |
Merge branch 'security-2773-milestones-fix' into 'master'
[master] Check issue milestone availability
See merge request gitlab/gitlabhq!2788
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 1 |
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 |