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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
ca05c3a9
Commit
ca05c3a9
authored
Jan 26, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace : with _ in cache key versioning
parent
6c978c8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
No files found.
app/models/ci/build.rb
View file @
ca05c3a9
...
@@ -466,7 +466,7 @@ module Ci
...
@@ -466,7 +466,7 @@ module Ci
if
cache
&&
project
.
jobs_cache_index
if
cache
&&
project
.
jobs_cache_index
cache
=
cache
.
merge
(
cache
=
cache
.
merge
(
key:
"
#{
cache
[
:key
]
}
:
#{
project
.
jobs_cache_index
}
"
)
key:
"
#{
cache
[
:key
]
}
_
#{
project
.
jobs_cache_index
}
"
)
end
end
[
cache
]
[
cache
]
...
...
spec/models/ci/build_spec.rb
View file @
ca05c3a9
...
@@ -277,7 +277,7 @@ describe Ci::Build do
...
@@ -277,7 +277,7 @@ describe Ci::Build do
allow_any_instance_of
(
Project
).
to
receive
(
:jobs_cache_index
).
and_return
(
1
)
allow_any_instance_of
(
Project
).
to
receive
(
:jobs_cache_index
).
and_return
(
1
)
end
end
it
{
is_expected
.
to
be_an
(
Array
).
and
all
(
include
(
key:
"key
:
1"
))
}
it
{
is_expected
.
to
be_an
(
Array
).
and
all
(
include
(
key:
"key
_
1"
))
}
end
end
context
'when project does not have jobs_cache_index'
do
context
'when project does not have jobs_cache_index'
do
...
...
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