Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 03:06:10 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 03:06:10 +0300
commitabfafe3c57f56cd76a0a9afb7275cddb12304544 (patch)
treef1a82b1afe78f1fd37234f86f3107bc8eb976742 /app/controllers/projects/pages_domains_controller.rb
parentef326e805ac99222c55e1efd9867045800f01a4b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/pages_domains_controller.rb')
-rw-r--r--app/controllers/projects/pages_domains_controller.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb
index c287e440db0..50a47e98893 100644
--- a/app/controllers/projects/pages_domains_controller.rb
+++ b/app/controllers/projects/pages_domains_controller.rb
@@ -62,6 +62,14 @@ class Projects::PagesDomainsController < Projects::ApplicationController
end
end
+ def clean_certificate
+ unless @domain.update(user_provided_certificate: nil, user_provided_key: nil)
+ flash[:alert] = @domain.errors.full_messages.join(', ')
+ end
+
+ redirect_to edit_project_pages_domain_path(@project, @domain)
+ end
+
private
def create_params