Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
562df3a3
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
562df3a3
编写于
12月 12, 2016
作者:
R
Regis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pass svg as prop to commit component
上级
07c6c8e0
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
6 deletion
+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
未找到文件。
app/assets/javascripts/vue_pipelines_index/index.js.es6
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录