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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d7942f22
Commit
d7942f22
authored
Oct 30, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to disable the Performance Bar and document the `p b` shortcut in its doc page
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
9a58468b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
2 deletions
+36
-2
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml
...ance-bar-appears-enabled-even-though-it-won-t-show-up.yml
+5
-0
doc/administration/monitoring/performance/performance_bar.md
doc/administration/monitoring/performance/performance_bar.md
+6
-0
doc/workflow/shortcuts.md
doc/workflow/shortcuts.md
+1
-1
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+23
-0
No files found.
app/models/application_setting.rb
View file @
d7942f22
...
@@ -420,7 +420,7 @@ class ApplicationSetting < ActiveRecord::Base
...
@@ -420,7 +420,7 @@ class ApplicationSetting < ActiveRecord::Base
# the enabling/disabling is `performance_bar_allowed_group_id`
# the enabling/disabling is `performance_bar_allowed_group_id`
# - If `enable` is false, we set `performance_bar_allowed_group_id` to `nil`
# - If `enable` is false, we set `performance_bar_allowed_group_id` to `nil`
def
performance_bar_enabled
=
(
enable
)
def
performance_bar_enabled
=
(
enable
)
return
if
enable
return
if
Gitlab
::
Utils
.
to_boolean
(
enable
)
self
.
performance_bar_allowed_group_id
=
nil
self
.
performance_bar_allowed_group_id
=
nil
end
end
...
...
changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml
0 → 100644
View file @
d7942f22
---
title
:
Allow to disable the Performance Bar
merge_request
:
15084
author
:
type
:
fixed
doc/administration/monitoring/performance/performance_bar.md
View file @
d7942f22
...
@@ -28,6 +28,12 @@ will be allowed to display the Performance Bar.
...
@@ -28,6 +28,12 @@ will be allowed to display the Performance Bar.
Make sure _Enable the Performance Bar_ is checked and hit
Make sure _Enable the Performance Bar_ is checked and hit
**Save**
to save the changes.
**Save**
to save the changes.
Once the Performance Bar is enabled, you will need to press the
[
<kbd>p</kbd> +
<kbd>b</kbd> keyboard shortcut
](
../../../workflow/shortcuts.md
)
to actually
display it.
You can toggle the Bar using the same shortcut.
---
---
![
GitLab Performance Bar Admin Settings
](
img/performance_bar_configuration_settings.png
)
![
GitLab Performance Bar Admin Settings
](
img/performance_bar_configuration_settings.png
)
...
...
doc/workflow/shortcuts.md
View file @
d7942f22
...
@@ -9,7 +9,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
...
@@ -9,7 +9,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
|
<kbd>
n
</kbd>
| Main navigation |
|
<kbd>
n
</kbd>
| Main navigation |
|
<kbd>
s
</kbd>
| Focus search |
|
<kbd>
s
</kbd>
| Focus search |
|
<kbd>
f
</kbd>
| Focus filter |
|
<kbd>
f
</kbd>
| Focus filter |
|
<kbd>
p
b
</kbd>
| Show/hide the Performance Bar |
|
<kbd>
p
</kbd>
+
<kbd>
b
</kbd>
| Show/hide the Performance Bar |
|
<kbd>
?
</kbd>
| Show/hide this dialog |
|
<kbd>
?
</kbd>
| Show/hide this dialog |
|
<kbd>
⌘
</kbd>
+
<kbd>
shift
</kbd>
+
<kbd>
p
</kbd>
| Toggle markdown preview |
|
<kbd>
⌘
</kbd>
+
<kbd>
shift
</kbd>
+
<kbd>
p
</kbd>
| Toggle markdown preview |
|
<kbd>
↑
</kbd>
| Edit last comment (when focused on an empty textarea) |
|
<kbd>
↑
</kbd>
| Edit last comment (when focused on an empty textarea) |
...
...
spec/features/admin/admin_settings_spec.rb
View file @
d7942f22
...
@@ -95,6 +95,29 @@ feature 'Admin updates settings' do
...
@@ -95,6 +95,29 @@ feature 'Admin updates settings' do
expect
(
find_field
(
'ED25519 SSH keys'
).
value
).
to
eq
(
forbidden
)
expect
(
find_field
(
'ED25519 SSH keys'
).
value
).
to
eq
(
forbidden
)
end
end
scenario
'Change Performance Bar settings'
do
group
=
create
(
:group
)
check
'Enable the Performance Bar'
fill_in
'Allowed group'
,
with:
group
.
path
click_on
'Save'
expect
(
page
).
to
have_content
'Application settings saved successfully'
expect
(
find_field
(
'Enable the Performance Bar'
)).
to
be_checked
expect
(
find_field
(
'Allowed group'
).
value
).
to
eq
group
.
path
uncheck
'Enable the Performance Bar'
click_on
'Save'
expect
(
page
).
to
have_content
'Application settings saved successfully'
expect
(
find_field
(
'Enable the Performance Bar'
)).
not_to
be_checked
expect
(
find_field
(
'Allowed group'
).
value
).
to
be_nil
end
def
check_all_events
def
check_all_events
page
.
check
(
'Active'
)
page
.
check
(
'Active'
)
page
.
check
(
'Push'
)
page
.
check
(
'Push'
)
...
...
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