Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3812f0dc
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 搜索 >>
提交
3812f0dc
编写于
10月 18, 2016
作者:
P
Phil Hughes
提交者:
Alfredo Sumaran
10月 26, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed delete branch tooltip and tests
Closes #23253
上级
2fc359a5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
25 deletion
+7
-25
CHANGELOG.md
CHANGELOG.md
+1
-0
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+6
-1
spec/features/projects/branches/delete_spec.rb
spec/features/projects/branches/delete_spec.rb
+0
-24
未找到文件。
CHANGELOG.md
浏览文件 @
3812f0dc
...
...
@@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Fix HipChat notifications rendering (airatshigapov, eisnerd)
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Removed delete branch tooltip !6954
-
Escape ref and path for relative links !6050 (winniehell)
-
Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
-
Fix filtering of milestones with quotes in title (airatshigapov)
...
...
app/views/projects/branches/_branch.html.haml
浏览文件 @
3812f0dc
...
...
@@ -31,7 +31,12 @@
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
branch
.
name
-
if
can?
(
current_user
,
:push_code
,
@project
)
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
"btn btn-remove remove-row has-tooltip
#{
can_remove_branch?
(
@project
,
branch
.
name
)
?
''
:
'disabled'
}
"
,
title:
"Delete branch"
,
method: :delete
,
data:
{
confirm:
"Deleting the '
#{
branch
.
name
}
' branch cannot be undone. Are you sure?"
,
container:
'body'
},
remote:
true
do
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
"btn btn-remove remove-row
#{
can_remove_branch?
(
@project
,
branch
.
name
)
?
''
:
'disabled'
}
"
,
method: :delete
,
data:
{
confirm:
"Deleting the '
#{
branch
.
name
}
' branch cannot be undone. Are you sure?"
},
remote:
true
,
"aria-label"
=>
"Delete branch"
do
=
icon
(
"trash-o"
)
-
if
branch
.
name
!=
@repository
.
root_ref
...
...
spec/features/projects/branches/delete_spec.rb
已删除
100644 → 0
浏览文件 @
2fc359a5
require
'spec_helper'
feature
'Delete branch'
,
feature:
true
,
js:
true
do
include
WaitForAjax
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
login_as
user
visit
namespace_project_branches_path
(
project
.
namespace
,
project
)
end
it
'destroys tooltip'
do
first
(
'.remove-row'
).
hover
expect
(
page
).
to
have_selector
(
'.tooltip'
)
first
(
'.remove-row'
).
click
wait_for_ajax
expect
(
page
).
not_to
have_selector
(
'.tooltip'
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录