diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-07-11 17:36:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-07-11 17:36:08 +0300 |
| commit | de72151cce2a2abdf861079dc9144a66f8a4ab30 (patch) | |
| tree | ee9466e6b06536a65d4e851f4096679c6f968d1e /spec/controllers/projects/find_file_controller_spec.rb | |
| parent | 1bf54e092783f7ad388225d32ab79ac1e845559c (diff) | |
| parent | a63bce1a4b55bc6cbafb9dec12d33028521489e9 (diff) | |
Merge branch '42751-rename-master-to-maintainer-2' into 'master'
Resolve "Rename the `Master` role to `Maintainer`" Backend
Closes #42751
See merge request gitlab-org/gitlab-ce!19413
Diffstat (limited to 'spec/controllers/projects/find_file_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/find_file_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/find_file_controller_spec.rb b/spec/controllers/projects/find_file_controller_spec.rb index 505fe82851a..66fe41108e2 100644 --- a/spec/controllers/projects/find_file_controller_spec.rb +++ b/spec/controllers/projects/find_file_controller_spec.rb @@ -7,7 +7,7 @@ describe Projects::FindFileController do before do sign_in(user) - project.add_master(user) + project.add_maintainer(user) controller.instance_variable_set(:@project, project) end |