diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 21:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-09 21:09:34 +0300 |
| commit | 7d112a9002182130f6a06f890bb17450b03406f9 (patch) | |
| tree | aaf42b63098935ad2f854a09d244e35352c60713 /spec/features | |
| parent | d56569ff3e73ae1dbcf93d2530925c4ecb8fd185 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb index f92fbbc0caa..add8e9f30de 100644 --- a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb @@ -28,6 +28,10 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', let(:expected_detached_mr_tag) { 'merge request' } before do + # rubocop:disable RSpec/AvoidConditionalStatements + stub_licensed_features(merge_request_approvers: true) if Gitlab.ee? + # rubocop:enable RSpec/AvoidConditionalStatements + stub_application_setting(auto_devops_enabled: false) stub_ci_pipeline_yaml_file(YAML.dump(config)) project.add_maintainer(user) |