Skip to content
Snippets Groups Projects
Unverified Commit 961a6bfc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

API delete branch: render branch name json instead of true

parent 8388bbe8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -19,6 +19,7 @@ class Projects::BranchesController < Projects::ApplicationController
def create
result = CreateBranchService.new(project, current_user).
execute(params[:branch_name], params[:ref])
if result[:status] == :success
@branch = result[:branch]
redirect_to project_tree_path(@project, @branch.name)
Loading
Loading
Loading
Loading
@@ -82,6 +82,7 @@ module API
authorize_push_project
result = CreateBranchService.new(user_project, current_user).
execute(params[:branch_name], params[:ref])
if result[:status] == :success
present result[:branch],
with: Entities::RepoObject,
Loading
Loading
@@ -104,7 +105,9 @@ module API
execute(params[:branch])
 
if result[:status] == :success
true
{
branch_name: params[:branch]
}
else
render_api_error!(result[:message], result[:return_code])
end
Loading
Loading
Loading
Loading
@@ -146,6 +146,7 @@ describe API::API, api: true do
it "should remove branch" do
delete api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
response.status.should == 200
json_response['branch_name'].should == branch_name
end
 
it 'should return 404 if branch not exists' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment