Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
aa934c74
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,体验更适合开发者的 AI 搜索 >>
提交
aa934c74
编写于
12月 21, 2016
作者:
J
Jarka Kadlecova
提交者:
Jarka Kadlecova
1月 11, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refresh merge widget after using /merge command
上级
7ab3dd4b
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
77 addition
and
0 deletion
+77
-0
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+12
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+10
-0
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-0
config/routes/project.rb
config/routes/project.rb
+1
-0
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+52
-0
未找到文件。
app/assets/javascripts/notes.js
浏览文件 @
aa934c74
...
...
@@ -3,6 +3,7 @@
/* global GLForm */
/* global Autosave */
/* global ResolveService */
/* global mrRefreshWidgetUrl */
/*= require autosave */
/*= require autosize */
...
...
@@ -244,6 +245,16 @@
};
Notes
.
prototype
.
handleCreateChanges
=
function
(
note
)
{
if
(
typeof
note
===
'
undefined
'
)
{
return
;
}
if
(
note
.
commands_changes
&&
note
.
commands_changes
.
includes
(
'
merge
'
))
{
$
.
get
(
mrRefreshWidgetUrl
);
}
};
/*
Render note in main comments area.
...
...
@@ -429,6 +440,7 @@
*/
Notes
.
prototype
.
addNote
=
function
(
xhr
,
note
,
status
)
{
this
.
handleCreateChanges
(
note
);
return
this
.
renderNote
(
note
);
};
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
aa934c74
...
...
@@ -347,6 +347,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
merge_widget_refresh
if
merge_request
.
in_progress_merge_commit_sha
@status
=
:success
elsif
merge_request
.
merge_when_build_succeeds
@status
=
:merge_when_build_succeeds
end
render
'merge'
end
def
branch_from
# This is always source
@source_project
=
@merge_request
.
nil?
?
@project
:
@merge_request
.
source_project
...
...
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
aa934c74
...
...
@@ -112,3 +112,5 @@
merge_request
=
new
MergeRequest
({
action
:
"
#{
controller
.
action_name
}
"
});
var
mrRefreshWidgetUrl
=
"
#{
@merge_request
&&
@merge_request
.
source_project
?
merge_widget_refresh_namespace_project_merge_request_url
(
@merge_request
.
source_project
.
namespace
,
@merge_request
.
source_project
,
@merge_request
)
:
''
}
"
;
config/routes/project.rb
浏览文件 @
aa934c74
...
...
@@ -94,6 +94,7 @@ constraints(ProjectUrlConstrainer.new) do
get
:pipelines
get
:merge_check
post
:merge
get
:merge_widget_refresh
post
:cancel_merge_when_build_succeeds
get
:ci_status
get
:ci_environments_status
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
浏览文件 @
aa934c74
...
...
@@ -1048,4 +1048,56 @@ describe Projects::MergeRequestsController do
end
end
end
describe
'GET merge_widget_refresh'
do
let
(
:params
)
do
{
namespace_id:
project
.
namespace
.
path
,
project_id:
project
.
path
,
id:
merge_request
.
iid
,
format: :raw
}
end
before
do
project
.
team
<<
[
user
,
:developer
]
xhr
:get
,
:merge_widget_refresh
,
params
end
context
'when merge in progress'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
in_progress_merge_commit_sha:
'sha'
)
}
it
'returns an OK response'
do
expect
(
response
).
to
have_http_status
(
:ok
)
end
it
'returns :success'
do
expect
(
assigns
(
:status
)).
to
eq
(
:success
)
end
end
context
'when waiting for build'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
merge_when_build_succeeds:
true
,
merge_user:
user
)
}
it
'returns an OK response'
do
expect
(
response
).
to
have_http_status
(
:ok
)
end
it
'returns :merge_when_build_succeeds'
do
expect
(
assigns
(
:status
)).
to
eq
(
:merge_when_build_succeeds
)
end
end
context
'when no special status for MR'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
it
'returns an OK response'
do
expect
(
response
).
to
have_http_status
(
:ok
)
end
it
'returns nil'
do
expect
(
assigns
(
:status
)).
to
be_nil
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录