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
a2da60b2
Commit
a2da60b2
authored
Dec 17, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
4f8ebf86
5afbeaad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/deprecated-positional-seperator-parameter.yml
.../unreleased/deprecated-positional-seperator-parameter.yml
+5
-0
spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
...services/migrate_to_ghost_user_service_shared_examples.rb
+1
-1
No files found.
changelogs/unreleased/deprecated-positional-seperator-parameter.yml
0 → 100644
View file @
a2da60b2
---
title
:
Passing the separator argument as a positional parameter is deprecated
merge_request
:
23334
author
:
Jasper Maes
type
:
other
spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
View file @
a2da60b2
...
...
@@ -86,7 +86,7 @@ shared_examples "migrating a deleted user's associated records to the ghost user
end
it
"blocks the user before
#{
record_class_name
}
migration begins"
do
expect
(
service
).
to
receive
(
"migrate_
#{
record_class_name
.
parameterize
(
'_'
).
pluralize
}
"
.
to_sym
)
do
expect
(
service
).
to
receive
(
"migrate_
#{
record_class_name
.
parameterize
(
separator:
'_'
).
pluralize
}
"
.
to_sym
)
do
expect
(
user
.
reload
).
to
be_blocked
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