summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-11-16 11:23:36 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-11-16 11:58:25 +0000
commitb210cbca6cad033f58e62dad08ebd30b77036126 (patch)
tree227f0a5db1700343b516a610f4b904cc13bd51e7
parent9a8fa8e04f71393e2e5d875b6824cba8cbedf37d (diff)
downloadgitlab-ce-b210cbca6cad033f58e62dad08ebd30b77036126.tar.gz
Fix eslint errors
Fix rubocop error
-rw-r--r--app/assets/javascripts/environments/components/environment_actions.js.es62
-rw-r--r--app/assets/javascripts/environments/components/environment_external_url.js.es62
-rw-r--r--app/assets/javascripts/environments/components/environment_item.js.es618
-rw-r--r--app/assets/javascripts/environments/components/environment_rollback.js.es62
-rw-r--r--app/assets/javascripts/environments/components/environment_stop.js.es64
-rw-r--r--app/assets/javascripts/environments/vue_resource_interceptor.js.es610
-rw-r--r--app/assets/javascripts/vue_common_component/commit.js.es62
-rw-r--r--spec/features/environments_spec.rb2
8 files changed, 21 insertions, 21 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 1d04b8a4701..db415bb20eb 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -1,4 +1,4 @@
-/*= require vue
+/*= require vue */
/* global Vue */
(() => {
diff --git a/app/assets/javascripts/environments/components/environment_external_url.js.es6 b/app/assets/javascripts/environments/components/environment_external_url.js.es6
index eca0c368622..79cd5ded5bd 100644
--- a/app/assets/javascripts/environments/components/environment_external_url.js.es6
+++ b/app/assets/javascripts/environments/components/environment_external_url.js.es6
@@ -1,4 +1,4 @@
-/*= require vue
+/*= require vue */
/* global Vue */
(() => {
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index bea6d09aacc..20720d69df0 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -1,10 +1,10 @@
-/*= require lib/utils/timeago
-/*= require lib/utils/text_utility
-/*= require vue_common_component/commit
-/*= require ./environment_actions
-/*= require ./environment_external_url
-/*= require ./environment_stop
-/*= require ./environment_rollback
+/*= require lib/utils/timeago */
+/*= require lib/utils/text_utility */
+/*= require vue_common_component/commit */
+/*= require ./environment_actions */
+/*= require ./environment_external_url */
+/*= require ./environment_stop */
+/*= require ./environment_rollback */
/* globals Vue, timeago */
@@ -17,7 +17,7 @@
* Recursive component based on [Tree View](https://vuejs.org/examples/tree-view.html)
*
* See this [issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/22539)
- * for more information.
+ * for more information.15
*/
window.gl = window.gl || {};
@@ -153,7 +153,7 @@
* @returns {String}
*/
createdDate() {
- const timeagoInstance = new timeago();
+ const timeagoInstance = new timeago(); // eslint-disable-line
return timeagoInstance.format(this.model.created_at);
},
diff --git a/app/assets/javascripts/environments/components/environment_rollback.js.es6 b/app/assets/javascripts/environments/components/environment_rollback.js.es6
index 055b0efec56..55e5c826e07 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.js.es6
+++ b/app/assets/javascripts/environments/components/environment_rollback.js.es6
@@ -1,4 +1,4 @@
-/*= require vue
+/*= require vue */
/* global Vue */
(() => {
diff --git a/app/assets/javascripts/environments/components/environment_stop.js.es6 b/app/assets/javascripts/environments/components/environment_stop.js.es6
index 1ae02d8080c..b39af2efb57 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js.es6
+++ b/app/assets/javascripts/environments/components/environment_stop.js.es6
@@ -1,4 +1,4 @@
-/*= require vue
+/*= require vue */
/* global Vue */
(() => {
@@ -15,7 +15,7 @@
methods: {
openConfirmDialog() {
- return window.confirm('Are you sure you want to stop this environment?');
+ return window.confirm('Are you sure you want to stop this environment?'); // eslint-disable-line
},
},
diff --git a/app/assets/javascripts/environments/vue_resource_interceptor.js.es6 b/app/assets/javascripts/environments/vue_resource_interceptor.js.es6
index 6d3e71d0110..406bdbc1c7d 100644
--- a/app/assets/javascripts/environments/vue_resource_interceptor.js.es6
+++ b/app/assets/javascripts/environments/vue_resource_interceptor.js.es6
@@ -1,12 +1,12 @@
-/* eslint-disable */
+/* global Vue */
Vue.http.interceptors.push((request, next) => {
Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
- next(function (response) {
- if (typeof response.data === "string") {
- response.data = JSON.parse(response.data)
+ next((response) => {
+ if (typeof response.data === 'string') {
+ response.data = JSON.parse(response.data); // eslint-disable-line
}
- Vue.activeResources--;
+ Vue.activeResources--; // eslint-disable-line
});
});
diff --git a/app/assets/javascripts/vue_common_component/commit.js.es6 b/app/assets/javascripts/vue_common_component/commit.js.es6
index e66db860297..0d4110cbcfb 100644
--- a/app/assets/javascripts/vue_common_component/commit.js.es6
+++ b/app/assets/javascripts/vue_common_component/commit.js.es6
@@ -1,4 +1,4 @@
-/*= require vue
+/*= require vue */
/* global Vue */
(() => {
window.gl = window.gl || {};
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index f36a895a037..fbf0b6392b9 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-feature 'Environments', feature: true, js:true do
+feature 'Environments', feature: true, js: true do
given(:project) { create(:empty_project) }
given(:user) { create(:user) }
given(:role) { :developer }