Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a8e4f3ed
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 搜索 >>
提交
a8e4f3ed
编写于
4月 16, 2012
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Auto-merge: 'already can not be merged' alert
上级
8269a3a7
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
25 addition
and
5 deletion
+25
-5
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+7
-1
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+6
-2
app/views/merge_requests/automerge.js.haml
app/views/merge_requests/automerge.js.haml
+7
-2
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+5
-0
未找到文件。
app/assets/javascripts/merge_requests.js
浏览文件 @
a8e4f3ed
...
...
@@ -7,7 +7,7 @@ var MergeRequest = {
function
(
opts
)
{
this
.
opts
=
opts
;
if
(
$
(
"
.automerge_widget
"
).
leng
ht
){
if
(
$
(
"
.automerge_widget
"
).
leng
th
){
$
.
get
(
opts
.
url_to_automerge_check
,
function
(
data
){
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.automerge_widget.
"
+
data
.
state
).
show
();
...
...
@@ -48,5 +48,11 @@ var MergeRequest = {
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
},
dataType
:
"
script
"
});
},
already_cannot_be_merged
:
function
(){
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
}
}
app/controllers/merge_requests_controller.rb
浏览文件 @
a8e4f3ed
...
...
@@ -104,9 +104,13 @@ class MergeRequestsController < ApplicationController
end
def
automerge
render_404
unless
@merge_request
.
open?
&&
@merge_request
.
can_be_merged?
return
access_denied!
unless
can?
(
current_user
,
:accept_mr
,
@project
)
if
@merge_request
.
open?
&&
@merge_request
.
can_be_merged?
@merge_request
.
automerge!
(
current_user
)
@status
=
true
else
@status
=
false
end
end
def
destroy
...
...
app/views/merge_requests/automerge.js.haml
浏览文件 @
a8e4f3ed
:plain
-
if
@status
:plain
location.reload();
-
else
:plain
MergeRequest.already_cannot_be_merged()
app/views/merge_requests/show.html.haml
浏览文件 @
a8e4f3ed
...
...
@@ -72,6 +72,11 @@
%p
%strong
Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged
{
:style
=>
"display:none"
}
.alert-message
%p
%strong
This merge request already can not be merged
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录