diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-05 13:40:58 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-05 13:40:58 +0000 |
commit | cb18dfea0505f47062096e05eda8f74111c1fc39 (patch) | |
tree | c5f09691fe175a42c648b97eb63b1c2be8d922d1 /app/controllers | |
parent | 09f482ba41b9dd021f1dc43a0ddf4ca3814bfc6b (diff) | |
parent | 6610f2fdcb4b641e9c1c87891e9de1ca28c1f518 (diff) | |
download | gitlab-ce-cb18dfea0505f47062096e05eda8f74111c1fc39.tar.gz |
Merge branch '28996-create-mvc-ui-in-haml' into 'master'
Add Let's Encrypt option in Pages domain new/edit Haml form
See merge request gitlab-org/gitlab-ce!26438
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/pages_domains_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb index 58b1bc54181..89f21d8dadb 100644 --- a/app/controllers/projects/pages_domains_controller.rb +++ b/app/controllers/projects/pages_domains_controller.rb @@ -65,11 +65,11 @@ class Projects::PagesDomainsController < Projects::ApplicationController private def create_params - params.require(:pages_domain).permit(:key, :certificate, :domain) + params.require(:pages_domain).permit(:key, :certificate, :domain, :auto_ssl_enabled) end def update_params - params.require(:pages_domain).permit(:key, :certificate) + params.require(:pages_domain).permit(:key, :certificate, :auto_ssl_enabled) end # rubocop: disable CodeReuse/ActiveRecord |