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
eb9e09bb
Commit
eb9e09bb
authored
Apr 02, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always allow the performance bar to be enabled for admins
parent
2f17b4cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
lib/gitlab/performance_bar.rb
lib/gitlab/performance_bar.rb
+1
-0
spec/lib/gitlab/performance_bar_spec.rb
spec/lib/gitlab/performance_bar_spec.rb
+6
-0
No files found.
lib/gitlab/performance_bar.rb
View file @
eb9e09bb
...
@@ -5,6 +5,7 @@ module Gitlab
...
@@ -5,6 +5,7 @@ module Gitlab
def
self
.
enabled?
(
user
=
nil
)
def
self
.
enabled?
(
user
=
nil
)
return
true
if
Rails
.
env
.
development?
return
true
if
Rails
.
env
.
development?
return
true
if
user
&
.
admin?
return
false
unless
user
&&
allowed_group_id
return
false
unless
user
&&
allowed_group_id
allowed_user_ids
.
include?
(
user
.
id
)
allowed_user_ids
.
include?
(
user
.
id
)
...
...
spec/lib/gitlab/performance_bar_spec.rb
View file @
eb9e09bb
...
@@ -25,6 +25,12 @@ describe Gitlab::PerformanceBar do
...
@@ -25,6 +25,12 @@ describe Gitlab::PerformanceBar do
expect
(
described_class
.
enabled?
(
nil
)).
to
be_falsy
expect
(
described_class
.
enabled?
(
nil
)).
to
be_falsy
end
end
it
'returns true when given user is an admin'
do
user
=
build_stubbed
(
:user
,
:admin
)
expect
(
described_class
.
enabled?
(
user
)).
to
be_truthy
end
it
'returns false when allowed_group_id is nil'
do
it
'returns false when allowed_group_id is nil'
do
expect
(
described_class
).
to
receive
(
:allowed_group_id
).
and_return
(
nil
)
expect
(
described_class
).
to
receive
(
:allowed_group_id
).
and_return
(
nil
)
...
...
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