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
d1004b79
Commit
d1004b79
authored
Feb 15, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2
Fix broken test
parent
ace33c55
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
...ssets/javascripts/commit/pipelines/pipelines_store.js.es6
+2
-4
app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
...ssets/javascripts/commit/pipelines/pipelines_table.js.es6
+3
-4
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+0
-1
No files found.
app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
View file @
d1004b79
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
*
*
* Used to store the Pipelines rendered in the commit view in the pipelines table.
* Used to store the Pipelines rendered in the commit view in the pipelines table.
*/
*/
require('../../vue_realtime_listener');
class PipelinesStore {
class PipelinesStore {
constructor() {
constructor() {
...
@@ -44,7 +45,4 @@ class PipelinesStore {
...
@@ -44,7 +45,4 @@ class PipelinesStore {
}
}
}
}
window.gl = window.gl || {};
module.exports = PipelinesStore;
gl.commits = gl.commits || {};
gl.commits.pipelines = gl.commits.pipelines || {};
gl.commits.pipelines.PipelinesStore = PipelinesStore;
app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
View file @
d1004b79
...
@@ -6,9 +6,8 @@ window.Vue.use(require('vue-resource'));
...
@@ -6,9 +6,8 @@ window.Vue.use(require('vue-resource'));
require('../../lib/utils/common_utils');
require('../../lib/utils/common_utils');
require('../../vue_shared/vue_resource_interceptor');
require('../../vue_shared/vue_resource_interceptor');
require('../../vue_shared/components/pipelines_table');
require('../../vue_shared/components/pipelines_table');
require('../../vue_realtime_listener/index');
require('./pipelines_service');
require('./pipelines_service');
require('./pipelines_store');
const PipelineStore =
require('./pipelines_store');
/**
/**
*
*
...
@@ -41,7 +40,7 @@ require('./pipelines_store');
...
@@ -41,7 +40,7 @@ require('./pipelines_store');
data() {
data() {
const pipelinesTableData = document.querySelector('#commit-pipeline-table-view').dataset;
const pipelinesTableData = document.querySelector('#commit-pipeline-table-view').dataset;
const svgsData = document.querySelector('.pipeline-svgs').dataset;
const svgsData = document.querySelector('.pipeline-svgs').dataset;
const store = new
gl.commits.pipelines.Pipelines
Store();
const store = new
Pipeline
Store();
// Transform svgs DOMStringMap to a plain Object.
// Transform svgs DOMStringMap to a plain Object.
const svgsObject = gl.utils.DOMStringMapToObject(svgsData);
const svgsObject = gl.utils.DOMStringMapToObject(svgsData);
...
@@ -81,7 +80,7 @@ require('./pipelines_store');
...
@@ -81,7 +80,7 @@ require('./pipelines_store');
beforeUpdate() {
beforeUpdate() {
if (this.state.pipelines.length && this.$children) {
if (this.state.pipelines.length && this.$children) {
this.s
tore.startTimeAgoLoops.call(this, Vue);
PipelineS
tore.startTimeAgoLoops.call(this, Vue);
}
}
},
},
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
d1004b79
...
@@ -39,7 +39,6 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
...
@@ -39,7 +39,6 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
beforeUpdate() {
beforeUpdate() {
if (this.pipelines.length && this.$children) {
if (this.pipelines.length && this.$children) {
debugger;
CommitPipelinesStoreWithTimeAgo.startTimeAgoLoops.call(this, Vue);
CommitPipelinesStoreWithTimeAgo.startTimeAgoLoops.call(this, Vue);
}
}
},
},
...
...
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