diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-09 15:03:30 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-09 15:03:30 +0100 |
| commit | bb04df8e3cedc3aa804c7d240e491c3dacc6a2b9 (patch) | |
| tree | 75e4ed717637b38e7b2b5e0c25881e97fcc856b4 /spec/policies/environment_policy_spec.rb | |
| parent | 11914d121106fe709db6a976ee9ea22924341631 (diff) | |
| parent | f59a44dbdf616d29e0185090a1401a6706aef33f (diff) | |
| download | gitlab-ce-31349-pipelines-vue.tar.gz | |
Merge branch 'master' into 31349-pipelines-vue31349-pipelines-vue
* master:
Prevent vue.esm.js from being bundled into the primary JS bundle
Robustify environment policy specs to pass on EE
Fallback to default pattern when note does not belong to project
Fix skipped manual actions issue in pipeline processing
Diffstat (limited to 'spec/policies/environment_policy_spec.rb')
| -rw-r--r-- | spec/policies/environment_policy_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/policies/environment_policy_spec.rb b/spec/policies/environment_policy_spec.rb index 0e15beaa5e8..650432520bb 100644 --- a/spec/policies/environment_policy_spec.rb +++ b/spec/policies/environment_policy_spec.rb @@ -33,7 +33,7 @@ describe EnvironmentPolicy do let(:project) { create(:project, :public) } before do - project.add_master(user) + project.add_developer(user) end context 'when team member has ability to stop environment' do |