diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 21:09:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 21:09:52 +0000 |
commit | ae93b284016c07a8a4b47e2510789253d14870f3 (patch) | |
tree | c7dc8690b841dd7d3a4eeeca944969d14df582a6 /app/controllers/projects | |
parent | f697dc5e76dfc5894df006d53b2b7e751653cf05 (diff) | |
download | gitlab-ce-ae93b284016c07a8a4b47e2510789253d14870f3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/pages_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/pages_domains_controller.rb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index 18a171700e9..2a8bc823931 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -10,7 +10,7 @@ class Projects::PagesController < Projects::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def show - @domains = @project.pages_domains.order(:domain) + @domains = @project.pages_domains.order(:domain).present(current_user: current_user) end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb index 5a81a064048..cdf6f5ce828 100644 --- a/app/controllers/projects/pages_domains_controller.rb +++ b/app/controllers/projects/pages_domains_controller.rb @@ -26,6 +26,12 @@ class Projects::PagesDomainsController < Projects::ApplicationController redirect_to project_pages_domain_path(@project, @domain) end + def retry_auto_ssl + PagesDomains::RetryAcmeOrderService.new(@domain.pages_domain).execute + + redirect_to project_pages_domain_path(@project, @domain) + end + def edit redirect_to project_pages_domain_path(@project, @domain) end @@ -82,6 +88,6 @@ class Projects::PagesDomainsController < Projects::ApplicationController end def domain - @domain ||= @project.pages_domains.find_by_domain!(params[:id].to_s) + @domain ||= @project.pages_domains.find_by_domain!(params[:id].to_s).present(current_user: current_user) end end |