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
1a7ba2a5
Commit
1a7ba2a5
authored
Oct 24, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/sh-flush-cache-after-import'
parents
352ab2fa
8a3710f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
28 deletions
+21
-28
CHANGELOG.md
CHANGELOG.md
+1
-0
app/models/repository.rb
app/models/repository.rb
+15
-12
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+5
-16
No files found.
CHANGELOG.md
View file @
1a7ba2a5
...
@@ -14,6 +14,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -14,6 +14,7 @@ Please view this file on the master branch, on stable branches it's out of date.
## 8.13.1 (unreleased)
## 8.13.1 (unreleased)
-
Fix error in generating labels
-
Fix error in generating labels
-
Fix reply-by-email not working due to queue name mismatch
-
Fix reply-by-email not working due to queue name mismatch
-
Expire and build repository cache after project import
## 8.13.0 (2016-10-22)
## 8.13.0 (2016-10-22)
-
Removes extra line for empty issue description. (!7045)
-
Removes extra line for empty issue description. (!7045)
...
...
app/models/repository.rb
View file @
1a7ba2a5
...
@@ -419,6 +419,17 @@ class Repository
...
@@ -419,6 +419,17 @@ class Repository
@exists
=
nil
@exists
=
nil
end
end
# expire cache that doesn't depend on repository data (when expiring)
def
expire_content_cache
expire_tags_cache
expire_tag_count_cache
expire_branches_cache
expire_branch_count_cache
expire_root_ref_cache
expire_emptiness_caches
expire_exists_cache
end
# Runs code after a repository has been created.
# Runs code after a repository has been created.
def
after_create
def
after_create
expire_exists_cache
expire_exists_cache
...
@@ -434,14 +445,7 @@ class Repository
...
@@ -434,14 +445,7 @@ class Repository
expire_cache
if
exists?
expire_cache
if
exists?
# expire cache that don't depend on repository data (when expiring)
expire_content_cache
expire_tags_cache
expire_tag_count_cache
expire_branches_cache
expire_branch_count_cache
expire_root_ref_cache
expire_emptiness_caches
expire_exists_cache
repository_event
(
:remove_repository
)
repository_event
(
:remove_repository
)
end
end
...
@@ -473,14 +477,13 @@ class Repository
...
@@ -473,14 +477,13 @@ class Repository
end
end
def
before_import
def
before_import
expire_emptiness_caches
expire_content_cache
expire_exists_cache
end
end
# Runs code after a repository has been forked/imported.
# Runs code after a repository has been forked/imported.
def
after_import
def
after_import
expire_
emptiness_caches
expire_
content_cache
expire_exists
_cache
build
_cache
end
end
# Runs code after a new commit has been pushed.
# Runs code after a new commit has been pushed.
...
...
spec/models/repository_spec.rb
View file @
1a7ba2a5
...
@@ -1146,28 +1146,17 @@ describe Repository, models: true do
...
@@ -1146,28 +1146,17 @@ describe Repository, models: true do
end
end
describe
'#before_import'
do
describe
'#before_import'
do
it
'flushes the emptiness cachess'
do
it
'flushes the repository caches'
do
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
expect
(
repository
).
to
receive
(
:expire_content_cache
)
repository
.
before_import
end
it
'flushes the exists cache'
do
expect
(
repository
).
to
receive
(
:expire_exists_cache
)
repository
.
before_import
repository
.
before_import
end
end
end
end
describe
'#after_import'
do
describe
'#after_import'
do
it
'flushes the emptiness cachess'
do
it
'flushes and builds the cache'
do
expect
(
repository
).
to
receive
(
:expire_emptiness_caches
)
expect
(
repository
).
to
receive
(
:expire_content_cache
)
expect
(
repository
).
to
receive
(
:build_cache
)
repository
.
after_import
end
it
'flushes the exists cache'
do
expect
(
repository
).
to
receive
(
:expire_exists_cache
)
repository
.
after_import
repository
.
after_import
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