diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-13 09:09:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-13 09:09:29 +0000 |
commit | 778ea71394b9bc20b614f766fbb90ddd7ef0cfe9 (patch) | |
tree | eab01c4cbca68ea98ab86bf54a526aadaf2ab208 /spec/simplecov_env.rb | |
parent | 69eacec239225fedaf27a177eee9a9070e0c68fb (diff) | |
download | gitlab-ce-778ea71394b9bc20b614f766fbb90ddd7ef0cfe9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/simplecov_env.rb')
-rw-r--r-- | spec/simplecov_env.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb index efd0c07b1b2..17b76205d9e 100644 --- a/spec/simplecov_env.rb +++ b/spec/simplecov_env.rb @@ -47,7 +47,7 @@ module SimpleCovEnv def configure_profile SimpleCov.configure do load_profile 'test_frameworks' - track_files '{app,config,danger,db,haml_lint,lib,qa,rubocop,scripts,tooling}/**/*.rb' + track_files '{app,config/initializers,config/initializers_before_autoloader,db/post_migrate,haml_lint,lib,rubocop,tooling}/**/*.rb' add_filter '/vendor/ruby/' add_filter '/app/controllers/sherlock/' @@ -73,8 +73,7 @@ module SimpleCovEnv add_group 'Initializers', %w[config/initializers config/initializers_before_autoloader] # Matches EE files as well add_group 'Migrations', %w[db/migrate db/optional_migrations db/post_migrate] # Matches EE files as well add_group 'Libraries', %w[/lib /ee/lib] - add_group 'Tooling', %w[/danger /haml_lint /rubocop /scripts /tooling] - add_group 'QA', '/qa' + add_group 'Tooling', %w[/haml_lint /rubocop /tooling] merge_timeout 365.days end |