Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3812f0dc
Commit
3812f0dc
authored
Oct 18, 2016
by
Phil Hughes
Committed by
Alfredo Sumaran
Oct 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed delete branch tooltip and tests
Closes #23253
parent
2fc359a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
25 deletions
+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
No files found.
CHANGELOG.md
View file @
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
View file @
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
deleted
100644 → 0
View file @
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment