BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b210cbca
Commit
b210cbca
authored
Nov 16, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint errors
Fix rubocop error
parent
9a8fa8e0
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
21 deletions
+21
-21
environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+1
-1
environment_external_url.js.es6
...s/environments/components/environment_external_url.js.es6
+1
-1
environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+9
-9
environment_rollback.js.es6
...ripts/environments/components/environment_rollback.js.es6
+1
-1
environment_stop.js.es6
...vascripts/environments/components/environment_stop.js.es6
+2
-2
vue_resource_interceptor.js.es6
.../javascripts/environments/vue_resource_interceptor.js.es6
+5
-5
commit.js.es6
app/assets/javascripts/vue_common_component/commit.js.es6
+1
-1
environments_spec.rb
spec/features/environments_spec.rb
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
b210cbca
/*= require vue
/*= require vue
*/
/* global Vue */
/* global Vue */
(() => {
(() => {
...
...
app/assets/javascripts/environments/components/environment_external_url.js.es6
View file @
b210cbca
/*= require vue
/*= require vue
*/
/* global Vue */
/* global Vue */
(() => {
(() => {
...
...
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
b210cbca
/*= require lib/utils/timeago
/*= require lib/utils/timeago
*/
/*= require lib/utils/text_utility
/*= require lib/utils/text_utility
*/
/*= require vue_common_component/commit
/*= require vue_common_component/commit
*/
/*= require ./environment_actions
/*= require ./environment_actions
*/
/*= require ./environment_external_url
/*= require ./environment_external_url
*/
/*= require ./environment_stop
/*= require ./environment_stop
*/
/*= require ./environment_rollback
/*= require ./environment_rollback
*/
/* globals Vue, timeago */
/* globals Vue, timeago */
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
* Recursive component based on [Tree View](https://vuejs.org/examples/tree-view.html)
* 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)
* See this [issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/22539)
* for more information.
* for more information.
15
*/
*/
window.gl = window.gl || {};
window.gl = window.gl || {};
...
@@ -153,7 +153,7 @@
...
@@ -153,7 +153,7 @@
* @returns {String}
* @returns {String}
*/
*/
createdDate() {
createdDate() {
const timeagoInstance = new timeago();
const timeagoInstance = new timeago();
// eslint-disable-line
return timeagoInstance.format(this.model.created_at);
return timeagoInstance.format(this.model.created_at);
},
},
...
...
app/assets/javascripts/environments/components/environment_rollback.js.es6
View file @
b210cbca
/*= require vue
/*= require vue
*/
/* global Vue */
/* global Vue */
(() => {
(() => {
...
...
app/assets/javascripts/environments/components/environment_stop.js.es6
View file @
b210cbca
/*= require vue
/*= require vue
*/
/* global Vue */
/* global Vue */
(() => {
(() => {
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
methods: {
methods: {
openConfirmDialog() {
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
},
},
},
},
...
...
app/assets/javascripts/environments/vue_resource_interceptor.js.es6
View file @
b210cbca
/*
eslint-disabl
e */
/*
global Vu
e */
Vue.http.interceptors.push((request, next) => {
Vue.http.interceptors.push((request, next) => {
Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
next(
function (response)
{
next(
(response) =>
{
if (typeof response.data ===
"string"
) {
if (typeof response.data ===
'string'
) {
response.data = JSON.parse(response.data)
response.data = JSON.parse(response.data)
; // eslint-disable-line
}
}
Vue.activeResources--;
Vue.activeResources--;
// eslint-disable-line
});
});
});
});
app/assets/javascripts/vue_common_component/commit.js.es6
View file @
b210cbca
/*= require vue
/*= require vue
*/
/* global Vue */
/* global Vue */
(() => {
(() => {
window.gl = window.gl || {};
window.gl = window.gl || {};
...
...
spec/features/environments_spec.rb
View file @
b210cbca
require
'spec_helper'
require
'spec_helper'
feature
'Environments'
,
feature:
true
,
js
:true
do
feature
'Environments'
,
feature:
true
,
js:
true
do
given
(
:project
)
{
create
(
:empty_project
)
}
given
(
:project
)
{
create
(
:empty_project
)
}
given
(
:user
)
{
create
(
:user
)
}
given
(
:user
)
{
create
(
:user
)
}
given
(
:role
)
{
:developer
}
given
(
:role
)
{
:developer
}
...
...
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