Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
76abe0ed
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,发现更多精彩内容 >>
提交
76abe0ed
编写于
12月 02, 2016
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change ref property to commitRef
上级
a1556200
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
13 deletion
+13
-13
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+1
-1
app/assets/javascripts/vue_common_component/commit.js.es6
app/assets/javascripts/vue_common_component/commit.js.es6
+7
-7
spec/javascripts/vue_common_components/commit_spec.js.es6
spec/javascripts/vue_common_components/commit_spec.js.es6
+5
-5
未找到文件。
app/assets/javascripts/environments/components/environment_item.js.es6
浏览文件 @
76abe0ed
...
...
@@ -451,7 +451,7 @@
<div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
<commit-component
:tag="commitTag"
:
r
ef="commitRef"
:
commitR
ef="commitRef"
:commit_url="commitUrl"
:short_sha="commitShortSha"
:title="commitTitle"
...
...
app/assets/javascripts/vue_common_component/commit.js.es6
浏览文件 @
76abe0ed
...
...
@@ -23,7 +23,7 @@
* name
* ref_url
*/
r
ef: {
commitR
ef: {
type: Object,
required: false,
default: () => ({}),
...
...
@@ -79,8 +79,8 @@
*
* @returns {Boolean}
*/
hasRef() {
return this.
ref && this.ref.name && this.r
ef.ref_url;
has
Commit
Ref() {
return this.
commitRef && this.commitRef.name && this.commitR
ef.ref_url;
},
/**
...
...
@@ -131,15 +131,15 @@
template: `
<div class="branch-commit">
<div v-if="hasRef" class="icon-container">
<div v-if="has
Commit
Ref" class="icon-container">
<i v-if="tag" class="fa fa-tag"></i>
<i v-if="!tag" class="fa fa-code-fork"></i>
</div>
<a v-if="hasRef"
<a v-if="has
Commit
Ref"
class="monospace branch-name"
:href="
r
ef.ref_url">
{{
r
ef.name}}
:href="
commitR
ef.ref_url">
{{
commitR
ef.name}}
</a>
<div class="icon-container commit-icon commit-icon-container"></div>
...
...
spec/javascripts/vue_common_components/commit_spec.js.es6
浏览文件 @
76abe0ed
...
...
@@ -10,7 +10,7 @@ describe('Commit component', () => {
el: document.querySelector('.test-commit-container'),
propsData: {
tag: false,
r
ef: {
commitR
ef: {
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
...
...
@@ -34,7 +34,7 @@ describe('Commit component', () => {
props = {
tag: true,
r
ef: {
commitR
ef: {
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
...
...
@@ -59,11 +59,11 @@ describe('Commit component', () => {
});
it('should render a link to the ref url', () => {
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.
r
ef.ref_url);
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.
commitR
ef.ref_url);
});
it('should render the ref name', () => {
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.
r
ef.name);
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.
commitR
ef.name);
});
it('should render the commit short sha with a link to the commit url', () => {
...
...
@@ -103,7 +103,7 @@ describe('Commit component', () => {
fixture.set('<div class="test-commit-container"></div>');
props = {
tag: false,
r
ef: {
commitR
ef: {
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录