diff options
| author | wendy0402 <wendykurniawan92@gmail.com> | 2017-01-29 07:14:56 +0700 |
|---|---|---|
| committer | wendy0402 <wendykurniawan92@gmail.com> | 2017-02-12 09:02:03 +0700 |
| commit | 9a24db121c6eda400ee531bf0253038d9fb28a52 (patch) | |
| tree | 305ff89f8403d9f2472cd6923330f0f8bc502f8e /app/services/issues/build_service.rb | |
| parent | edb8ed36cd5ce315ca45a047bd06ab1dfcf44203 (diff) | |
| download | gitlab-ce-9a24db121c6eda400ee531bf0253038d9fb28a52.tar.gz | |
fix issue creation from milestone doesn't assign the milestone
Diffstat (limited to 'app/services/issues/build_service.rb')
| -rw-r--r-- | app/services/issues/build_service.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index a63982f60c8..7cd927d8005 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -44,7 +44,15 @@ module Issues end def issue_params - @issue_params ||= issue_params_with_info_from_merge_request.merge(params.slice(:title, :description)) + @issue_params ||= issue_params_with_info_from_merge_request.merge(whitelisted_issue_params) + end + + def whitelisted_issue_params + if can?(current_user, :admin_issue, project) + params.slice(:title, :description, :milestone_id) + else + params.slice(:title, :description) + end end end end |