Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1c2d283d
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,发现更多精彩内容 >>
提交
1c2d283d
编写于
2月 15, 2018
作者:
C
Clement Ho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add dispatcher imports for bundles used in merge request show path
上级
efdde042
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
24 deletion
+22
-24
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+2
-2
app/assets/javascripts/how_to_merge.js
app/assets/javascripts/how_to_merge.js
+13
-12
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+6
-2
app/views/projects/merge_requests/_how_to_merge.html.haml
app/views/projects/merge_requests/_how_to_merge.html.haml
+0
-3
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+1
-2
未找到文件。
app/assets/javascripts/diff_notes/diff_notes_bundle.js
浏览文件 @
1c2d283d
...
...
@@ -15,7 +15,7 @@ import './components/resolve_discussion_btn';
import
'
./components/diff_note_avatars
'
;
import
'
./components/new_issue_for_discussion
'
;
$
(
()
=>
{
export
default
()
=>
{
const
projectPathHolder
=
document
.
querySelector
(
'
.merge-request
'
)
||
document
.
querySelector
(
'
.commit-box
'
);
const
projectPath
=
projectPathHolder
.
dataset
.
projectPath
;
const
COMPONENT_SELECTOR
=
'
resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
...
...
@@ -75,4 +75,4 @@ $(() => {
});
$
(
window
).
trigger
(
'
resize.nav
'
);
}
)
;
};
app/assets/javascripts/how_to_merge.js
浏览文件 @
1c2d283d
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
modal
=
$
(
'
#modal_merge_info
'
).
modal
({
modal
:
true
,
show
:
false
,
});
$
(
'
.how_to_merge_link
'
).
on
(
'
click
'
,
()
=>
{
modal
.
show
();
});
$
(
'
.modal-header .close
'
).
on
(
'
click
'
,
()
=>
{
modal
.
hide
();
});
});
export
default
()
=>
{
const
modal
=
$
(
'
#modal_merge_info
'
);
if
(
modal
)
{
modal
.
modal
({
modal
:
true
,
show
:
false
,
});
$
(
'
.how_to_merge_link
'
).
on
(
'
click
'
,
modal
.
show
);
$
(
'
.modal-header .close
'
).
on
(
'
click
'
,
modal
.
hide
);
}
};
app/assets/javascripts/pages/projects/merge_requests/show/index.js
浏览文件 @
1c2d283d
...
...
@@ -2,16 +2,19 @@ import MergeRequest from '~/merge_request';
import
ZenMode
from
'
~/zen_mode
'
;
import
initNotes
from
'
~/init_notes
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initDiffNotes
from
'
~/diff_notes/diff_notes_bundle
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
export
default
()
=>
{
new
Diff
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
// eslint-disable-line no-new
initNotes
();
// eslint-disable-line no-new
initIssuableSidebar
();
initNotes
();
initDiffNotes
();
const
mrShowNode
=
document
.
querySelector
(
'
.merge-request
'
);
...
...
@@ -21,4 +24,5 @@ export default () => {
new
ShortcutsIssuable
(
true
);
// eslint-disable-line no-new
handleLocationHash
();
howToMerge
();
};
app/views/projects/merge_requests/_how_to_merge.html.haml
浏览文件 @
1c2d283d
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'how_to_merge'
)
#modal_merge_info
.modal
.modal-dialog
.modal-content
...
...
app/views/projects/merge_requests/show.html.haml
浏览文件 @
1c2d283d
...
...
@@ -4,9 +4,6 @@
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'diff_notes'
)
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
=
render
"projects/merge_requests/mr_title"
...
...
config/webpack.config.js
浏览文件 @
1c2d283d
...
...
@@ -66,7 +66,6 @@ var config = {
graphs_charts
:
'
./graphs/graphs_charts.js
'
,
graphs_show
:
'
./graphs/graphs_show.js
'
,
help
:
'
./help/help.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
job_details
:
'
./jobs/job_details_bundle.js
'
,
locale
:
'
./locale/index.js
'
,
...
...
@@ -155,7 +154,7 @@ var config = {
include
:
/node_modules
\/
katex
\/
dist/
,
use
:
[
{
loader
:
'
style-loader
'
},
{
{
loader
:
'
css-loader
'
,
options
:
{
name
:
'
[name].[hash].[ext]
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录