Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
b173ae6b
Commit
b173ae6b
authored
Jun 07, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix linting, route, and specs
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
af0c6917
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
18 deletions
+12
-18
app/assets/javascripts/peek.js
app/assets/javascripts/peek.js
+3
-3
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-1
app/views/peek/views/_pg.html.haml
app/views/peek/views/_pg.html.haml
+3
-3
config/initializers/peek.rb
config/initializers/peek.rb
+1
-1
config/routes.rb
config/routes.rb
+1
-1
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+1
-1
vendor/assets/javascripts/peek.js
vendor/assets/javascripts/peek.js
+2
-8
No files found.
app/assets/javascripts/peek.js
View file @
b173ae6b
import
'
vendor/peek
'
;
import
'
vendor/peek.performance_bar
'
;
$
(
document
).
on
(
'
click
'
,
'
#peek-show-queries
'
,
function
(
e
)
{
$
(
document
).
on
(
'
click
'
,
'
#peek-show-queries
'
,
(
e
)
=>
{
e
.
preventDefault
();
$
(
'
.peek-rblineprof-modal
'
).
hide
();
le
t
$modal
=
$
(
'
#modal-peek-pg-queries
'
);
cons
t
$modal
=
$
(
'
#modal-peek-pg-queries
'
);
if
(
$modal
.
length
)
{
$modal
.
modal
(
'
toggle
'
);
}
});
$
(
document
).
on
(
'
click
'
,
'
.js-lineprof-file
'
,
function
(
e
)
{
$
(
document
).
on
(
'
click
'
,
'
.js-lineprof-file
'
,
(
e
)
=>
{
e
.
preventDefault
();
$
(
this
).
parents
(
'
.heading
'
).
next
(
'
div
'
).
toggle
();
});
app/controllers/application_controller.rb
View file @
b173ae6b
...
...
@@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base
before_action
:ldap_security_check
before_action
:sentry_context
before_action
:default_headers
before_action
:add_gon_variables
,
unless:
->
{
request
.
path
.
start_with?
(
'/peek'
)
}
before_action
:add_gon_variables
,
unless:
->
{
request
.
path
.
start_with?
(
'/
-/
peek'
)
}
before_action
:configure_permitted_parameters
,
if: :devise_controller?
before_action
:require_email
,
unless: :devise_controller?
...
...
app/views/peek/views/_pg.html.haml
View file @
b173ae6b
%strong
%a
#peek-show-queries
{
href:
'#'
}
%span
{
data:
{
defer_to:
"#{view.defer_key}-duration"
}}
...
%span
{
data:
{
defer_to:
"#{view.defer_key}-duration"
}
}
...
\/
%span
{
data:
{
defer_to:
"#{view.defer_key}-calls"
}}
...
%span
{
data:
{
defer_to:
"#{view.defer_key}-calls"
}
}
...
#modal-peek-pg-queries
.modal
{
tabindex:
-
1
}
.modal-dialog
#modal-peek-pg-queries-content
.modal-content
...
...
@@ -10,5 +10,5 @@
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h4
SQL queries
.modal-body
{
data:
{
defer_to:
"#{view.defer_key}-queries"
}}
...
.modal-body
{
data:
{
defer_to:
"#{view.defer_key}-queries"
}
}
...
pg
config/initializers/peek.rb
View file @
b173ae6b
...
...
@@ -17,6 +17,7 @@
Peek
.
into
Peek
::
Views
::
Rblineprof
Peek
.
into
Peek
::
Views
::
GC
# rubocop:disable Style/ClassAndModuleCamelCase
class
PEEK_DB_CLIENT
class
<<
self
attr_accessor
:query_details
...
...
@@ -24,5 +25,4 @@ class << self
self
.
query_details
=
Concurrent
::
Array
.
new
end
# rubocop:disable Style/ClassAndModuleCamelCase
PEEK_DB_VIEW
.
prepend
::
Gitlab
::
PerformanceBar
::
PeekQueryTracker
config/routes.rb
View file @
b173ae6b
...
...
@@ -11,7 +11,6 @@
post
:toggle_award_emoji
,
on: :member
end
mount
Peek
::
Railtie
=>
'/peek'
draw
:sherlock
draw
:development
draw
:ci
...
...
@@ -43,6 +42,7 @@
get
'liveness'
=>
'health#liveness'
get
'readiness'
=>
'health#readiness'
resources
:metrics
,
only:
[
:index
]
mount
Peek
::
Railtie
=>
'/peek'
end
# Koding route
...
...
spec/models/commit_spec.rb
View file @
b173ae6b
...
...
@@ -20,8 +20,8 @@
end
it
'caches the author'
do
allow
(
RequestStore
).
to
receive
(
:active?
).
and_return
(
true
)
user
=
create
(
:user
,
email:
commit
.
author_email
)
expect
(
RequestStore
).
to
receive
(
:active?
).
and_return
(
true
)
expect_any_instance_of
(
Commit
).
to
receive
(
:find_author_by_any_email
).
and_call_original
expect
(
commit
.
author
).
to
eq
(
user
)
...
...
vendor/assets/javascripts/peek.js
View file @
b173ae6b
let
requestId
=
null
;
(
function
(
$
)
{
var
fetchRequestResults
,
getRequestId
,
peekEnabled
,
toggleBar
,
updatePerformanceBar
;
getRequestId
=
function
()
{
if
(
requestId
!=
null
)
{
return
requestId
;
}
else
{
return
$
(
'
#peek
'
).
data
(
'
request-id
'
);
}
return
$
(
'
#peek
'
).
data
(
'
request-id
'
);
};
peekEnabled
=
function
()
{
return
$
(
'
#peek
'
).
length
;
...
...
@@ -64,7 +58,7 @@ let requestId = null;
}
};
fetchRequestResults
=
function
()
{
return
$
.
ajax
(
'
/peek/results
'
,
{
return
$
.
ajax
(
'
/
-/
peek/results
'
,
{
data
:
{
request_id
:
getRequestId
()
},
...
...
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