diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-10 12:04:54 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-10 12:04:54 +0300 |
| commit | 1cc2aa5b39211b7db880eeb339969ca3220e07cc (patch) | |
| tree | 8022f34db1537cc9fdfc01722fdf015030efd33a /app/views | |
| parent | 9361ce5429e2288b27e43de926e2c1294f0c4f00 (diff) | |
| parent | ac44b737c8fc1eff0cf90c1562c6aa68cf06c82a (diff) | |
Merge branch 'patch-56' into 'master'
Clarify that performance bar is not always on
See merge request gitlab-org/gitlab-ce!28287
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_performance_bar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/metrics_and_profiling.html.haml | 2 |
2 files changed, 2 insertions, 2 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' |