Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
70e5851b7029
Commit
70e5851b
authored
Jun 16, 2015
by
Stan Hu
Browse files
Return 40x error codes if branch could not be deleted in UI
parent
0a8f3822de5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
70e5851b
...
...
@@ -20,6 +20,7 @@
- Update maintenance documentation to explain no need to recompile asssets for omnibus installations (Stan Hu)
- Support commenting on diffs in side-by-side mode (Stan Hu)
- Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu)
- Return 40x error codes if branch could not be deleted in UI (Stan Hu)
- Remove project visibility icons from dashboard projects list
- Rename "Design" profile settings page to "Preferences".
- Allow users to customize their default Dashboard page.
...
...
app/controllers/projects/branches_controller.rb
View file @
70e5851b
...
...
@@ -32,7 +32,7 @@
end
def
destroy
DeleteBranchService
.
new
(
project
,
current_user
).
execute
(
params
[
:id
])
status
=
DeleteBranchService
.
new
(
project
,
current_user
).
execute
(
params
[
:id
])
@branch_name
=
params
[
:id
]
respond_to
do
|
format
|
...
...
@@ -40,7 +40,7 @@
redirect_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
)
end
format
.
js
format
.
js
{
render
status:
status
[
:return_code
]
}
end
end
end
spec/controllers/branches_controller_spec.rb
View file @
70e5851b
...
...
@@ -55,4 +55,30 @@
it
{
is_expected
.
to
render_template
(
'new'
)
}
end
end
describe
"POST destroy"
do
render_views
before
do
post
:destroy
,
format: :js
,
id:
branch
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
end
context
"valid branch name, valid source"
do
let
(
:branch
)
{
"feature"
}
it
{
expect
(
response
.
status
).
to
eq
(
200
)
}
it
{
expect
(
subject
).
to
render_template
(
'destroy'
)
}
end
context
"invalid branch name, valid ref"
do
let
(
:branch
)
{
"no-branch"
}
it
{
expect
(
response
.
status
).
to
eq
(
404
)
}
it
{
expect
(
subject
).
to
render_template
(
'destroy'
)
}
end
end
end
Write
Preview
Supports
Markdown
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