Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a769e1ed
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,发现更多精彩内容 >>
未验证
提交
a769e1ed
编写于
5月 10, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed none merge request files not being openable in the web IDE
上级
f667bbce
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
2 deletion
+27
-2
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+1
-1
app/assets/javascripts/ide/stores/utils.js
app/assets/javascripts/ide/stores/utils.js
+1
-0
spec/javascripts/ide/components/repo_editor_spec.js
spec/javascripts/ide/components/repo_editor_spec.js
+25
-1
未找到文件。
app/assets/javascripts/ide/components/repo_editor.vue
浏览文件 @
a769e1ed
...
...
@@ -140,7 +140,7 @@ export default {
this
.
file
.
staged
&&
this
.
file
.
key
.
indexOf
(
'
unstaged-
'
)
===
0
?
head
:
null
,
);
if
(
this
.
viewer
===
viewerTypes
.
mr
)
{
if
(
this
.
viewer
===
viewerTypes
.
mr
&&
this
.
file
.
mrChange
)
{
this
.
editor
.
attachMergeRequestModel
(
this
.
model
);
}
else
{
this
.
editor
.
attachModel
(
this
.
model
);
...
...
app/assets/javascripts/ide/stores/utils.js
浏览文件 @
a769e1ed
...
...
@@ -44,6 +44,7 @@ export const dataStructure = () => ({
size
:
0
,
parentPath
:
null
,
lastOpenedAt
:
0
,
mrChange
:
null
,
});
export
const
decorateData
=
entity
=>
{
...
...
spec/javascripts/ide/components/repo_editor_spec.js
浏览文件 @
a769e1ed
...
...
@@ -24,7 +24,7 @@ describe('RepoEditor', () => {
f
.
active
=
true
;
f
.
tempFile
=
true
;
vm
.
$store
.
state
.
openFiles
.
push
(
f
);
vm
.
$store
.
state
.
entries
[
f
.
path
]
=
f
;
Vue
.
set
(
vm
.
$store
.
state
.
entries
,
f
.
path
,
f
)
;
vm
.
monaco
=
true
;
vm
.
$mount
();
...
...
@@ -215,6 +215,30 @@ describe('RepoEditor', () => {
expect
(
vm
.
editor
.
attachModel
).
toHaveBeenCalledWith
(
vm
.
model
);
});
it
(
'
attaches model to merge request editor
'
,
()
=>
{
vm
.
$store
.
state
.
viewer
=
'
mrdiff
'
;
vm
.
file
.
mrChange
=
true
;
spyOn
(
vm
.
editor
,
'
attachMergeRequestModel
'
);
Editor
.
editorInstance
.
modelManager
.
dispose
();
vm
.
setupEditor
();
expect
(
vm
.
editor
.
attachMergeRequestModel
).
toHaveBeenCalledWith
(
vm
.
model
);
});
it
(
'
does not attach model to merge request editor when not a MR change
'
,
()
=>
{
vm
.
$store
.
state
.
viewer
=
'
mrdiff
'
;
vm
.
file
.
mrChange
=
false
;
spyOn
(
vm
.
editor
,
'
attachMergeRequestModel
'
);
Editor
.
editorInstance
.
modelManager
.
dispose
();
vm
.
setupEditor
();
expect
(
vm
.
editor
.
attachMergeRequestModel
).
not
.
toHaveBeenCalledWith
(
vm
.
model
);
});
it
(
'
adds callback methods
'
,
()
=>
{
spyOn
(
vm
.
editor
,
'
onPositionChange
'
).
and
.
callThrough
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录