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/features/projects/diffs | |
| 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/features/projects/diffs')
| -rw-r--r-- | spec/features/projects/diffs/diff_show_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/diffs/diff_show_spec.rb b/spec/features/projects/diffs/diff_show_spec.rb index 237157cd89d..df05625d105 100644 --- a/spec/features/projects/diffs/diff_show_spec.rb +++ b/spec/features/projects/diffs/diff_show_spec.rb @@ -24,7 +24,7 @@ describe 'Diff file viewer', :js do context 'Ruby file (stored in LFS)' do before do - project.add_master(project.creator) + project.add_maintainer(project.creator) @commit_id = Files::CreateService.new( project, |