diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-31 09:38:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-31 09:38:24 +0000 |
| commit | aa75a755ee8767c66d16fe93a48dd3f9e24a4784 (patch) | |
| tree | a42879302e0cfd0a109a2f8d032f5727b7de2a03 | |
| parent | 5a699090cde818294fca93d2793dd6195c0a7c2d (diff) | |
| parent | 20e04d9f398b1f4221fa9f5de529dea7c2f0f9c1 (diff) | |
| download | gitlab-ce-aa75a755ee8767c66d16fe93a48dd3f9e24a4784.tar.gz | |
Merge branch 'api-delete-branch-json' into 'master'
Api delete branch json
Fixes gitlab/gitlabhq#1478
See merge request !1233
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 1 | ||||
| -rw-r--r-- | doc/api/branches.md | 8 | ||||
| -rw-r--r-- | lib/api/branches.rb | 5 | ||||
| -rw-r--r-- | spec/requests/api/branches_spec.rb | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index dd6df5d196b..9f50660a5ad 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -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) diff --git a/doc/api/branches.md b/doc/api/branches.md index 74386615545..319f0b47386 100644 --- a/doc/api/branches.md +++ b/doc/api/branches.md @@ -211,3 +211,11 @@ Parameters: It return 200 if succeed, 404 if the branch to be deleted does not exist or 400 for other reasons. In case of an error, an explaining message is provided. + +Success response: + +```json +{ + "branch_name": "my-removed-branch" +} +``` diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 14f8b20f6b2..6ec1a753a69 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -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, @@ -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 diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb index 8834a6cfa83..b45572c39fd 100644 --- a/spec/requests/api/branches_spec.rb +++ b/spec/requests/api/branches_spec.rb @@ -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 |