diff options
author | Rémy Coutable <remy@rymai.me> | 2018-12-17 13:20:54 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 13:20:54 +0300 |
commit | 5afbeaad3bdd7e66faf12c78ca87d09f79025bb1 (patch) | |
tree | 99ffbd444a32b07fa87f14e2117f5e094ce5be0c | |
parent | bf137f43b56d54335c3e09b43b29c3729e7ffab9 (diff) | |
parent | 07eb92b6057293cc7429354fa5699d50d4e640b5 (diff) |
Merge branch 'deprecated-positional-seperator-parameter' into 'master'
Passing the separator argument as a positional parameter is deprecated
See merge request gitlab-org/gitlab-ce!23334
-rw-r--r-- | changelogs/unreleased/deprecated-positional-seperator-parameter.yml | 5 | ||||
-rw-r--r-- | spec/support/services/migrate_to_ghost_user_service_shared_examples.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/deprecated-positional-seperator-parameter.yml b/changelogs/unreleased/deprecated-positional-seperator-parameter.yml new file mode 100644 index 00000000000..0d952e0d5eb --- /dev/null +++ b/changelogs/unreleased/deprecated-positional-seperator-parameter.yml @@ -0,0 +1,5 @@ +--- +title: Passing the separator argument as a positional parameter is deprecated +merge_request: 23334 +author: Jasper Maes +type: other diff --git a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb index 1478c6b5a47..62ae95df8c0 100644 --- a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb +++ b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb @@ -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 |