diff options
author | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
commit | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (patch) | |
tree | 53f92c7f7766f9c0384ea507d812ce5e7d421b99 /app/controllers | |
parent | cb77087246929cc92f6bd7ce2cb306855b6e6219 (diff) | |
parent | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (diff) |
Merge branch '42751-rename-mr-maintainer-push' into 'master'
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 29632bef7e5..8e4aeec16dc 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -15,7 +15,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont def merge_request_params_attributes [ - :allow_maintainer_to_push, + :allow_collaboration, :assignee_id, :description, :force_remove_source_branch, |