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
54c04f53
Commit
54c04f53
authored
Jun 07, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures and add a feature flag for the performance bar
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
add21d40
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
lib/gitlab/performance_bar.rb
lib/gitlab/performance_bar.rb
+1
-1
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+1
-1
vendor/assets/stylesheets/peek.scss
vendor/assets/stylesheets/peek.scss
+9
-4
No files found.
lib/gitlab/performance_bar.rb
View file @
54c04f53
module
Gitlab
module
Gitlab
module
PerformanceBar
module
PerformanceBar
def
self
.
enabled?
def
self
.
enabled?
ENV
[
"PERFORMANCE_BAR"
]
==
'1'
Feature
.
enabled?
(
'gitlab_performance_bar'
)
end
end
end
end
end
end
spec/models/commit_spec.rb
View file @
54c04f53
...
@@ -21,7 +21,7 @@ describe Commit, models: true do
...
@@ -21,7 +21,7 @@ describe Commit, models: true do
it
'caches the author'
do
it
'caches the author'
do
user
=
create
(
:user
,
email:
commit
.
author_email
)
user
=
create
(
:user
,
email:
commit
.
author_email
)
expect
(
RequestStore
).
to
receive
(
:active?
).
twice
.
and_return
(
true
)
expect
(
RequestStore
).
to
receive
(
:active?
).
and_return
(
true
)
expect_any_instance_of
(
Commit
).
to
receive
(
:find_author_by_any_email
).
and_call_original
expect_any_instance_of
(
Commit
).
to
receive
(
:find_author_by_any_email
).
and_call_original
expect
(
commit
.
author
).
to
eq
(
user
)
expect
(
commit
.
author
).
to
eq
(
user
)
...
...
vendor/assets/stylesheets/peek.scss
View file @
54c04f53
...
@@ -6,8 +6,13 @@ header.navbar-gitlab.with-peek {
...
@@ -6,8 +6,13 @@ header.navbar-gitlab.with-peek {
}
}
#peek
{
#peek
{
background
:
$black
;
position
:
fixed
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
35px
;
height
:
35px
;
z-index
:
400
;
background
:
#000
;
line-height
:
35px
;
line-height
:
35px
;
color
:
#999
;
color
:
#999
;
...
@@ -53,12 +58,12 @@ header.navbar-gitlab.with-peek {
...
@@ -53,12 +58,12 @@ header.navbar-gitlab.with-peek {
}
}
strong
{
strong
{
color
:
$white-light
;
color
:
#fff
;
}
}
table
{
table
{
strong
{
strong
{
color
:
$black
;
color
:
#000
;
}
}
}
}
...
@@ -90,5 +95,5 @@ header.navbar-gitlab.with-peek {
...
@@ -90,5 +95,5 @@ header.navbar-gitlab.with-peek {
}
}
#modal-peek-pg-queries-content
{
#modal-peek-pg-queries-content
{
color
:
$black
;
color
:
#000
;
}
}
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