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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
0c835170
Commit
0c835170
authored
Nov 10, 2016
by
Regis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'alhpa-piplines' into auto-pipelines-vue
parents
8012abf4
f2e64fdd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/vue_pipelines_index/index.js.es6
app/assets/javascripts/vue_pipelines_index/index.js.es6
+1
-1
app/assets/javascripts/vue_pipelines_index/store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+3
-1
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-2
No files found.
app/assets/javascripts/vue_pipelines_index/index.js.es6
View file @
0c835170
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
return new Vue({
return new Vue({
el: '.vue-pipelines-index',
el: '.vue-pipelines-index',
data: {
data: {
scope: project.dataset.
projectId
,
scope: project.dataset.
url
,
count: project.dataset.count,
count: project.dataset.count,
store: new gl.PipelineStore(),
store: new gl.PipelineStore(),
},
},
...
...
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
0c835170
...
@@ -8,8 +8,10 @@
...
@@ -8,8 +8,10 @@
gl.PipelineStore = class {
gl.PipelineStore = class {
fetchDataLoop(Vue, pageNum) {
fetchDataLoop(Vue, pageNum) {
const goFetch = () =>
const goFetch = () =>
this.$http.get(`${api}/${this.scope}/pipelines${paginate}${pageNum}`)
// const url = `${api}/${this.scope}/pipelines${paginate}${pageNum}`
this.$http.get('/gitlab-org/gitlab-shell/pipelines.json?page=1')
.then((response) => {
.then((response) => {
debugger
Vue.set(this, 'pipelines', JSON.parse(response.body));
Vue.set(this, 'pipelines', JSON.parse(response.body));
}, () => new Flash(
}, () => new Flash(
'Something went wrong on our end.'
'Something went wrong on our end.'
...
...
app/views/projects/pipelines/index.html.haml
View file @
0c835170
...
@@ -35,8 +35,7 @@
...
@@ -35,8 +35,7 @@
=
link_to
ci_lint_path
,
class:
'btn btn-default'
do
=
link_to
ci_lint_path
,
class:
'btn btn-default'
do
%span
CI Lint
%span
CI Lint
%div
.content-list.pipelines
{
data:
{
url:
namespace_project_pipelines_path
(
@project
.
namespace
,
@project
,
format: :json
),
"data-count"
:
"#{@pipelines_count}"
}}
%div
.content-list.pipelines
{
"data-project-id"
:
"#{@project.id}"
,
"data-count"
:
"#{@pipelines_count}"
}
-
if
@pipelines
.
blank?
-
if
@pipelines
.
blank?
%div
%div
.nothing-here-block
No pipelines to show
.nothing-here-block
No pipelines to show
...
...
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