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
29c284cb
Commit
29c284cb
authored
Feb 24, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review - use relative paths
parent
e76d4f5f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
17 deletions
+31
-17
app/assets/javascripts/environments/components/deploy_board_component.js.es6
...pts/environments/components/deploy_board_component.js.es6
+2
-2
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+5
-5
app/assets/javascripts/environments/folder/environments_folder_view.js.es6
...ripts/environments/folder/environments_folder_view.js.es6
+23
-9
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+1
-1
No files found.
app/assets/javascripts/environments/components/deploy_board_component.js.es6
View file @
29c284cb
...
...
@@ -20,8 +20,8 @@
const Vue = require('vue');
const instanceComponent = require('./deploy_board_instance_component');
require('
../..
/lib/utils/common_utils');
const Flash = require('
../..
/flash');
require('
~
/lib/utils/common_utils');
const Flash = require('
~
/flash');
module.exports = Vue.component('deploy_boards_components', {
...
...
app/assets/javascripts/environments/components/environment.js.es6
View file @
29c284cb
...
...
@@ -3,12 +3,12 @@
const Vue = window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
const EnvironmentsService = require('
..
/services/environments_service');
const EnvironmentsService = require('
~/environments
/services/environments_service');
const EnvironmentTable = require('./environments_table');
const EnvironmentsStore = require('
..
/stores/environments_store');
require('
../..
/vue_shared/components/table_pagination');
require('
../..
/lib/utils/common_utils');
require('
../..
/vue_shared/vue_resource_interceptor');
const EnvironmentsStore = require('
~/environments
/stores/environments_store');
require('
~
/vue_shared/components/table_pagination');
require('
~
/lib/utils/common_utils');
require('
~
/vue_shared/vue_resource_interceptor');
module.exports = Vue.component('environment-component', {
...
...
app/assets/javascripts/environments/folder/environments_folder_view.js.es6
View file @
29c284cb
/* eslint-disable no-param-reassign, no-new */
/* global Flash */
/* eslint-disable no-new */
const Vue = window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
const EnvironmentsService = require('../services/environments_service');
const EnvironmentTable = require('../components/environments_table');
const EnvironmentsStore = require('../stores/environments_store');
require('../../vue_shared/components/table_pagination');
require('../../lib/utils/common_utils');
require('../../vue_shared/vue_resource_interceptor');
const EnvironmentsService = require('~/environments//services/environments_service');
const EnvironmentTable = require('~/environments/components/environments_table');
const EnvironmentsStore = require('~/environments//stores/environments_store');
const Flash = require('~/flash');
require('~/vue_shared/components/table_pagination');
require('~/lib/utils/common_utils');
require('~/vue_shared/vue_resource_interceptor');
module.exports = Vue.component('environment-folder-view', {
...
...
@@ -113,6 +113,17 @@ module.exports = Vue.component('environment-folder-view', {
},
methods: {
/**
* Toggles the visibility of the deploy boards of the clicked environment.
*
* @param {Object} model
* @return {Object}
*/
toggleDeployBoard(model) {
return this.store.toggleDeployBoard(model.id);
},
/**
* Will change the page number and update the URL.
*
...
...
@@ -168,7 +179,10 @@ module.exports = Vue.component('environment-folder-view', {
:can-read-environment="canReadEnvironmentParsed"
:play-icon-svg="playIconSvg"
:terminal-icon-svg="terminalIconSvg"
:commit-icon-svg="commitIconSvg">
:commit-icon-svg="commitIconSvg"
:toggleDeployBoard="toggleDeployBoard"
:store="store"
:service="service>
</environment-table>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
...
...
app/assets/stylesheets/pages/environments.scss
View file @
29c284cb
...
...
@@ -196,7 +196,7 @@
align-self
:
center
;
}
.deploy-board-error-message
{
&
.deploy-board-error-message
{
justify-content
:
center
;
}
}
...
...
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