diff options
author | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
---|---|---|
committer | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
commit | 7a21f39df92baaa88f9533316e7b19c9c70bd91e (patch) | |
tree | 090f49a7edc682c31ac29465205c16201bdbe03d /spec/controllers/projects/find_file_controller_spec.rb | |
parent | 331f8d71b2c778f10b926114caeb718bce7294d6 (diff) | |
parent | 767ccaa1725048cd2b27fbf1081cba3ba89d2926 (diff) | |
download | gitlab-ce-mikeformus/gitlab-ce-qa-264.tar.gz |
Merge branch 'master' into qa-264mikeformus/gitlab-ce-qa-264
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 |