diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-25 03:10:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-25 03:10:49 +0300 |
| commit | 4f79a3041736aadda887ebec4178731eb8681cff (patch) | |
| tree | 57b76f5fccfe112eedc64916ac2719b917616299 /app/controllers | |
| parent | 1f3baf00bfdff196b43ade455d8268ce10ff13aa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -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 b3ce3506c43..17d4a449d4e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -452,6 +452,7 @@ class ProjectsController < Projects::ApplicationController :packages_enabled, :service_desk_enabled, :merge_commit_template, + :squash_commit_template, project_setting_attributes: project_setting_attributes ] + [project_feature_attributes: project_feature_attributes] end |