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
562df3a3
Commit
562df3a3
authored
Dec 12, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pass svg as prop to commit component
parent
07c6c8e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/javascripts/vue_pipelines_index/index.js.es6
app/assets/javascripts/vue_pipelines_index/index.js.es6
+3
-0
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+5
-4
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+2
-2
No files found.
app/assets/javascripts/vue_pipelines_index/index.js.es6
View file @
562df3a3
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
(() => {
(() => {
const project = document.querySelector('.pipelines');
const project = document.querySelector('.pipelines');
const entry = document.querySelector('.vue-pipelines-index');
const entry = document.querySelector('.vue-pipelines-index');
const svgs = document.querySelector('.pipeline-svgs');
Vue.use(VueResource);
Vue.use(VueResource);
...
@@ -28,6 +29,7 @@
...
@@ -28,6 +29,7 @@
data: {
data: {
scope: project.dataset.url,
scope: project.dataset.url,
store: new gl.PipelineStore(),
store: new gl.PipelineStore(),
svgs: svgs.dataset,
},
},
components: {
components: {
'vue-pipelines': gl.VuePipelines,
'vue-pipelines': gl.VuePipelines,
...
@@ -37,6 +39,7 @@
...
@@ -37,6 +39,7 @@
<vue-pipelines
<vue-pipelines
:scope='scope'
:scope='scope'
:store='store'
:store='store'
:svgs='svgs'
>
>
</vue-pipelines>
</vue-pipelines>
</div>
</div>
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
View file @
562df3a3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
pageRequest: false,
pageRequest: false,
};
};
},
},
props: ['scope', 'store'],
props: ['scope', 'store'
, 'svgs'
],
created() {
created() {
const pagenum = gl.getParameterByName('p');
const pagenum = gl.getParameterByName('p');
const scope = gl.getParameterByName('scope');
const scope = gl.getParameterByName('scope');
...
@@ -81,12 +81,13 @@
...
@@ -81,12 +81,13 @@
<pipeline-url :pipeline='pipeline'></pipeline-url>
<pipeline-url :pipeline='pipeline'></pipeline-url>
<td>
<td>
<commit
<commit
:commit-icon-svg='svgs.commitIconSvg'
:author='author(pipeline)'
:author='author(pipeline)'
:tag="pipeline.ref['tag?']"
:tag="pipeline.ref['tag?']"
:title='commitTitle(pipeline)'
:title='commitTitle(pipeline)'
:commit
_
ref='ref(pipeline)'
:commit
-
ref='ref(pipeline)'
:short
_
sha='commitSha(pipeline)'
:short
-
sha='commitSha(pipeline)'
:commit
_
url='commitUrl(pipeline)'
:commit
-
url='commitUrl(pipeline)'
>
>
</commit>
</commit>
</td>
</td>
...
...
app/views/projects/pipelines/index.html.haml
View file @
562df3a3
...
@@ -40,8 +40,8 @@
...
@@ -40,8 +40,8 @@
%div
%div
.nothing-here-block
No pipelines to show
.nothing-here-block
No pipelines to show
-
else
-
else
.
commit-icon-svg.hidden
.
pipeline-svgs
{
"data"
=>
{
"commit-icon-svg"
=>
custom_icon
(
"icon_commit"
)}
}
=
custom_icon
(
"icon_commit"
)
.icon_status_canceled.hidden
.icon_status_canceled.hidden
=
custom_icon
(
"icon_status_canceled"
)
=
custom_icon
(
"icon_status_canceled"
)
.icon_status_running.hidden
.icon_status_running.hidden
...
...
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