diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-13 17:11:10 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | 7af585f1667935165701ec290e6ce37a436ad4c6 (patch) | |
| tree | 8905263cdf5e28c740176cb9dff827d33c38f5aa /app/controllers/projects_controller.rb | |
| parent | dede5f01889e31ae7dd1e3b45f6b3852e7c0e18a (diff) | |
| download | gitlab-ce-7af585f1667935165701ec290e6ce37a436ad4c6.tar.gz | |
Fast forward merge: basic implemenation[ci skip]
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b13034d3333..a738ca9f361 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -344,6 +344,7 @@ class ProjectsController < Projects::ApplicationController :tag_list, :visibility_level, :template_name, + :merge_method, project_feature_attributes: %i[ builds_access_level |