diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
| commit | 8048f99c21d0299313dcda172aae22fda8c519d3 (patch) | |
| tree | edf02d0adf376ee0cce7caa9c541c687bc25f43f /spec/features/projects/milestones/user_interacts_with_labels_spec.rb | |
| parent | 815947bf6785e1c458bad8d2d891e99279cab602 (diff) | |
| parent | 2c5e6b272e7984400ac4d297553b3f4f50a8d5c4 (diff) | |
| download | gitlab-ce-8048f99c21d0299313dcda172aae22fda8c519d3.tar.gz | |
Merge branch 'master' into 'qa-48464-add-edit-delete-file-scenario'sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario
# Conflicts:
# qa/qa.rb
Diffstat (limited to 'spec/features/projects/milestones/user_interacts_with_labels_spec.rb')
| -rw-r--r-- | spec/features/projects/milestones/user_interacts_with_labels_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/milestones/user_interacts_with_labels_spec.rb b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb index f6a82f80d65..a6d58be7b13 100644 --- a/spec/features/projects/milestones/user_interacts_with_labels_spec.rb +++ b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb @@ -11,7 +11,7 @@ describe 'User interacts with labels' do let(:label_enhancement) { create(:label, project: project, title: 'enhancement') } before do - project.add_master(user) + project.add_maintainer(user) sign_in(user) issue1.labels << [label_bug, label_feature] |