Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
201dd61b
Commit
201dd61b
authored
Mar 31, 2020
by
Vladimir Shushlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline failures after using presenter
parent
804747cf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/projects/pages_domains_controller.rb
app/controllers/projects/pages_domains_controller.rb
+1
-1
app/views/projects/pages_domains/_certificate.html.haml
app/views/projects/pages_domains/_certificate.html.haml
+1
-1
spec/views/projects/pages_domains/show.html.haml_spec.rb
spec/views/projects/pages_domains/show.html.haml_spec.rb
+1
-1
No files found.
app/controllers/projects/pages_domains_controller.rb
View file @
201dd61b
...
@@ -27,7 +27,7 @@ class Projects::PagesDomainsController < Projects::ApplicationController
...
@@ -27,7 +27,7 @@ class Projects::PagesDomainsController < Projects::ApplicationController
end
end
def
retry_auto_ssl
def
retry_auto_ssl
PagesDomains
::
RetryAcmeOrderService
.
new
(
@domain
).
execute
PagesDomains
::
RetryAcmeOrderService
.
new
(
@domain
.
pages_domain
).
execute
redirect_to
project_pages_domain_path
(
@project
,
@domain
)
redirect_to
project_pages_domain_path
(
@project
,
@domain
)
end
end
...
...
app/views/projects/pages_domains/_certificate.html.haml
View file @
201dd61b
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
=
_
(
'Certificate'
)
=
_
(
'Certificate'
)
.d-flex.justify-content-between.align-items-center.p-3
.d-flex.justify-content-between.align-items-center.p-3
%span
%span
=
@domain
.
subject
||
_
(
'missing'
)
=
@domain
.
pages_domain
.
subject
||
_
(
'missing'
)
=
link_to
_
(
'Remove'
),
=
link_to
_
(
'Remove'
),
clean_certificate_project_pages_domain_path
(
@project
,
@domain
),
clean_certificate_project_pages_domain_path
(
@project
,
@domain
),
data:
{
confirm:
_
(
'Are you sure?'
)
},
data:
{
confirm:
_
(
'Are you sure?'
)
},
...
...
spec/views/projects/pages_domains/show.html.haml_spec.rb
View file @
201dd61b
...
@@ -7,7 +7,7 @@ describe 'projects/pages_domains/show' do
...
@@ -7,7 +7,7 @@ describe 'projects/pages_domains/show' do
before
do
before
do
assign
(
:project
,
project
)
assign
(
:project
,
project
)
assign
(
:domain
,
domain
)
assign
(
:domain
,
Gitlab
::
View
::
Presenter
::
Factory
.
new
(
domain
).
fabricate!
)
stub_pages_setting
(
external_https:
true
)
stub_pages_setting
(
external_https:
true
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment