Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6a4aa3f9
Commit
6a4aa3f9
authored
Jun 09, 2019
by
Ben Bodenmiller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify that performance bar is not always on
parent
74511b04
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
app/views/admin/application_settings/_performance_bar.html.haml
...ews/admin/application_settings/_performance_bar.html.haml
+1
-1
app/views/admin/application_settings/metrics_and_profiling.html.haml
...dmin/application_settings/metrics_and_profiling.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+4
-1
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+4
-4
No files found.
app/views/admin/application_settings/_performance_bar.html.haml
View file @
6a4aa3f9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.form-check
.form-check
=
f
.
check_box
:performance_bar_enabled
,
class:
'form-check-input'
=
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
=
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
.form-group
=
f
.
label
:performance_bar_allowed_group_path
,
'Allowed group'
,
class:
'label-bold'
=
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
=
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
...
...
app/views/admin/application_settings/metrics_and_profiling.html.haml
View file @
6a4aa3f9
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%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'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'administration/monitoring/performance/performance_bar'
)
.settings-content
.settings-content
=
render
'performance_bar'
=
render
'performance_bar'
...
...
locale/gitlab.pot
View file @
6a4aa3f9
...
@@ -3677,7 +3677,10 @@ msgstr ""
...
@@ -3677,7 +3677,10 @@ msgstr ""
msgid "Enable shared Runners"
msgid "Enable shared Runners"
msgstr ""
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 ""
msgstr ""
msgid "Enable two-factor authentication"
msgid "Enable two-factor authentication"
...
...
spec/features/admin/admin_settings_spec.rb
View file @
6a4aa3f9
...
@@ -302,22 +302,22 @@ describe 'Admin updates settings' do
...
@@ -302,22 +302,22 @@ describe 'Admin updates settings' do
group
=
create
(
:group
)
group
=
create
(
:group
)
page
.
within
(
'.as-performance-bar'
)
do
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
fill_in
'Allowed group'
,
with:
group
.
path
click_on
'Save changes'
click_on
'Save changes'
end
end
expect
(
page
).
to
have_content
"Application settings saved successfully"
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
expect
(
find_field
(
'Allowed group'
).
value
).
to
eq
group
.
path
page
.
within
(
'.as-performance-bar'
)
do
page
.
within
(
'.as-performance-bar'
)
do
uncheck
'Enable the Performance Bar'
uncheck
'Enable
access to
the Performance Bar'
click_on
'Save changes'
click_on
'Save changes'
end
end
expect
(
page
).
to
have_content
'Application settings saved successfully'
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
expect
(
find_field
(
'Allowed group'
).
value
).
to
be_nil
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment