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
7eb90b72
Commit
7eb90b72
authored
Jul 27, 2020
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary call to UpdatePagesConfigurationService
parent
645cacf4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
2 deletions
+0
-2
app/models/project.rb
app/models/project.rb
+0
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+0
-1
No files found.
app/models/project.rb
View file @
7eb90b72
...
@@ -1803,7 +1803,6 @@ class Project < ApplicationRecord
...
@@ -1803,7 +1803,6 @@ class Project < ApplicationRecord
return
unless
namespace
return
unless
namespace
mark_pages_as_not_deployed
unless
destroyed?
mark_pages_as_not_deployed
unless
destroyed?
::
Projects
::
UpdatePagesConfigurationService
.
new
(
self
).
execute
# 1. We rename pages to temporary directory
# 1. We rename pages to temporary directory
# 2. We wait 5 minutes, due to NFS caching
# 2. We wait 5 minutes, due to NFS caching
...
...
spec/models/project_spec.rb
View file @
7eb90b72
...
@@ -4126,7 +4126,6 @@ RSpec.describe Project do
...
@@ -4126,7 +4126,6 @@ RSpec.describe Project do
end
end
it
'removes the pages directory and marks the project as not having pages deployed'
do
it
'removes the pages directory and marks the project as not having pages deployed'
do
expect_any_instance_of
(
Projects
::
UpdatePagesConfigurationService
).
to
receive
(
:execute
)
expect_any_instance_of
(
Gitlab
::
PagesTransfer
).
to
receive
(
:rename_project
).
and_return
(
true
)
expect_any_instance_of
(
Gitlab
::
PagesTransfer
).
to
receive
(
:rename_project
).
and_return
(
true
)
expect
(
PagesWorker
).
to
receive
(
:perform_in
).
with
(
5
.
minutes
,
:remove
,
namespace
.
full_path
,
anything
)
expect
(
PagesWorker
).
to
receive
(
:perform_in
).
with
(
5
.
minutes
,
:remove
,
namespace
.
full_path
,
anything
)
...
...
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