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
667005d5
Commit
667005d5
authored
May 11, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dm-fix-mysql-failure' into 'master'
Fix MySQL build failure Closes #32106 See merge request !11277
parents
934e8d1a
965b4176
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
...02101023_cleanup_namespaceless_pending_delete_projects.rb
+1
-1
spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
...ons/cleanup_namespaceless_pending_delete_projects_spec.rb
+1
-1
No files found.
db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
View file @
667005d5
...
@@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration
...
@@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration
private
private
def
pending_delete_batch
def
pending_delete_batch
connection
.
exec_query
(
find_batch
).
map
{
|
row
|
row
[
'id'
]
}
connection
.
exec_query
(
find_batch
).
map
{
|
row
|
row
[
'id'
]
.
to_i
}
end
end
BATCH_SIZE
=
5000
BATCH_SIZE
=
5000
...
...
spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
View file @
667005d5
...
@@ -15,7 +15,7 @@ describe CleanupNamespacelessPendingDeleteProjects do
...
@@ -15,7 +15,7 @@ describe CleanupNamespacelessPendingDeleteProjects do
project
=
build
(
:empty_project
,
pending_delete:
true
,
namespace_id:
nil
)
project
=
build
(
:empty_project
,
pending_delete:
true
,
namespace_id:
nil
)
project
.
save
(
validate:
false
)
project
.
save
(
validate:
false
)
expect
(
NamespacelessProjectDestroyWorker
).
to
receive
(
:bulk_perform_async
).
with
([[
project
.
id
.
to_s
]])
expect
(
NamespacelessProjectDestroyWorker
).
to
receive
(
:bulk_perform_async
).
with
([[
project
.
id
]])
described_class
.
new
.
up
described_class
.
new
.
up
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