diff options
author | Ben Bodenmiller <bbodenmiller@gmail.com> | 2019-06-09 01:04:59 -0700 |
---|---|---|
committer | Ben Bodenmiller <bbodenmiller@gmail.com> | 2019-06-09 01:04:59 -0700 |
commit | 6a4aa3f9be8b31e5d76750d40f15f5fef2c792af (patch) | |
tree | eccc4a00ab59b006723e9083e7e3ed1b0781f009 | |
parent | 74511b049743cf543694bb92a8acd7e7586e533d (diff) | |
download | gitlab-ce-6a4aa3f9be8b31e5d76750d40f15f5fef2c792af.tar.gz |
Clarify that performance bar is not always on
4 files changed, 10 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index f992d531ea5..1e66b635038 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -6,7 +6,7 @@ .form-check = f.check_box :performance_bar_enabled, class: 'form-check-input' = f.label :performance_bar_enabled, class: 'form-check-label qa-enable-performance-bar-checkbox' do - Enable the Performance Bar + Enable access to the Performance Bar .form-group = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-bold' = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path diff --git a/app/views/admin/application_settings/metrics_and_profiling.html.haml b/app/views/admin/application_settings/metrics_and_profiling.html.haml index d5ba6abe7af..01d61beaf53 100644 --- a/app/views/admin/application_settings/metrics_and_profiling.html.haml +++ b/app/views/admin/application_settings/metrics_and_profiling.html.haml @@ -31,7 +31,7 @@ %button.btn.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Enable the Performance Bar for a given group.') + = _('Enable access to the Performance Bar for a given group.') = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/performance_bar') .settings-content = render 'performance_bar' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 71ec8bcb9ba..a3b827bbfdf 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3677,7 +3677,10 @@ msgstr "" msgid "Enable shared Runners" msgstr "" -msgid "Enable the Performance Bar for a given group." +msgid "Enable access to the Performance Bar for a given group." +msgstr "" + +msgid "Enable access to the Performance Bar" msgstr "" msgid "Enable two-factor authentication" diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index f9950b5b03f..ba7a6f8f4b9 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -302,22 +302,22 @@ describe 'Admin updates settings' do group = create(:group) page.within('.as-performance-bar') do - check 'Enable the Performance Bar' + check 'Enable access to the Performance Bar' fill_in 'Allowed group', with: group.path click_on 'Save changes' end expect(page).to have_content "Application settings saved successfully" - expect(find_field('Enable the Performance Bar')).to be_checked + expect(find_field('Enable access to the Performance Bar')).to be_checked expect(find_field('Allowed group').value).to eq group.path page.within('.as-performance-bar') do - uncheck 'Enable the Performance Bar' + uncheck 'Enable access to the Performance Bar' click_on 'Save changes' end expect(page).to have_content 'Application settings saved successfully' - expect(find_field('Enable the Performance Bar')).not_to be_checked + expect(find_field('Enable access to the Performance Bar')).not_to be_checked expect(find_field('Allowed group').value).to be_nil end |