Merge branch '2139-pipelines-minutes' into 'master'
Rename build minutes to pipeline minutes Closes #2139 See merge request !1644
Showing
- app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml 2 additions, 2 deletions...cation_settings/_shared_runners_minutes_setting.html.haml
- app/views/admin/projects/_shared_runner_status.html.haml 2 additions, 2 deletionsapp/views/admin/projects/_shared_runner_status.html.haml
- app/views/groups/pipeline_quota/index.html.haml 1 addition, 1 deletionapp/views/groups/pipeline_quota/index.html.haml
- app/views/namespaces/_shared_runner_status.html.haml 1 addition, 1 deletionapp/views/namespaces/_shared_runner_status.html.haml
- app/views/namespaces/_shared_runners_minutes_setting.html.haml 2 additions, 2 deletions...iews/namespaces/_shared_runners_minutes_setting.html.haml
- app/views/projects/builds/_shared_runner_limit_warning.html.haml 1 addition, 1 deletion...ws/projects/builds/_shared_runner_limit_warning.html.haml
- app/views/shared/_shared_runners_minutes_limit.html.haml 1 addition, 1 deletionapp/views/shared/_shared_runners_minutes_limit.html.haml
- doc/user/admin_area/settings/continuous_integration.md 10 additions, 10 deletionsdoc/user/admin_area/settings/continuous_integration.md
- spec/features/admin/admin_users_spec.rb 3 additions, 3 deletionsspec/features/admin/admin_users_spec.rb
- spec/features/ci_shared_runner_settings_spec.rb 4 additions, 4 deletionsspec/features/ci_shared_runner_settings_spec.rb
- spec/features/ci_shared_runner_warnings_spec.rb 2 additions, 2 deletionsspec/features/ci_shared_runner_warnings_spec.rb
- spec/features/projects/builds_spec.rb 1 addition, 1 deletionspec/features/projects/builds_spec.rb
- spec/models/ee/ci/build_spec.rb 1 addition, 1 deletionspec/models/ee/ci/build_spec.rb
- spec/models/ee/project_spec.rb 2 additions, 2 deletionsspec/models/ee/project_spec.rb
Please register or sign in to comment