summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-07 19:55:07 +0200
committerRémy Coutable <remy@rymai.me>2017-06-09 17:21:39 +0200
commite85914532970d61d53f025f3ff0d85891bab2637 (patch)
treea54bac63e63570a31ff31d4cafffc31e1636a1a0 /app
parent55631e3d52dd2e16b69b02ffc99207b60a22989e (diff)
downloadgitlab-ce-e85914532970d61d53f025f3ff0d85891bab2637.tar.gz
Fix Rubocop offenses, improve SQL duration format and changelog entry
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/peek.js27
-rw-r--r--app/assets/javascripts/shortcuts.js5
2 files changed, 14 insertions, 18 deletions
diff --git a/app/assets/javascripts/peek.js b/app/assets/javascripts/peek.js
index 06a07c19e09..60f8bdd14c0 100644
--- a/app/assets/javascripts/peek.js
+++ b/app/assets/javascripts/peek.js
@@ -1,19 +1,16 @@
import 'vendor/peek';
import 'vendor/peek.performance_bar';
-(function() {
- $(document).on('click', '#peek-show-queries', function(e) {
- var $modal;
- $('.peek-rblineprof-modal').hide();
- $modal = $('#modal-peek-pg-queries');
- if ($modal.length) {
- $modal.modal('toggle');
- }
- return e.preventDefault();
- });
+$(document).on('click', '#peek-show-queries', function(e) {
+ e.preventDefault();
+ $('.peek-rblineprof-modal').hide();
+ let $modal = $('#modal-peek-pg-queries');
+ if ($modal.length) {
+ $modal.modal('toggle');
+ }
+});
- $(document).on('click', '.js-lineprof-file', function(e) {
- $(this).parents('.heading').next('div').toggle();
- return e.preventDefault();
- });
-}).call(window);
+$(document).on('click', '.js-lineprof-file', function(e) {
+ e.preventDefault();
+ $(this).parents('.heading').next('div').toggle();
+});
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
index 2c7698eb174..09cb914e884 100644
--- a/app/assets/javascripts/shortcuts.js
+++ b/app/assets/javascripts/shortcuts.js
@@ -60,11 +60,10 @@ import findAndFollowLink from './shortcuts_dashboard_navigation';
e.preventDefault();
if (Cookies.get('perf_bar_enabled') === 'true') {
Cookies.remove('perf_bar_enabled', { path: '/' });
- }
- else {
+ } else {
Cookies.set('perf_bar_enabled', true, { path: '/' });
}
- return gl.utils.refreshCurrentPage();
+ gl.utils.refreshCurrentPage();
};
Shortcuts.prototype.toggleMarkdownPreview = function(e) {