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
Léo-Paul Géneau
gitlab-ce
Commits
da4fc5b8
Commit
da4fc5b8
authored
Mar 29, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a future conflict
parent
ef106794
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
spec/tasks/gitlab/uploads/migrate_rake_spec.rb
spec/tasks/gitlab/uploads/migrate_rake_spec.rb
+2
-1
No files found.
spec/tasks/gitlab/uploads/migrate_rake_spec.rb
View file @
da4fc5b8
...
...
@@ -23,7 +23,8 @@ describe 'gitlab:uploads:migrate rake tasks' do
shared_examples
'enqueue jobs in batch'
do
|
batch
:|
it
do
expect
(
ObjectStorage
::
MigrateUploadsWorker
)
.
to
receive
(
:enqueue!
).
exactly
(
batch
).
times
.
to
receive
(
:perform_async
).
exactly
(
batch
).
times
.
and_return
(
"A fake job."
)
run
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