summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-02 10:53:10 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-17 09:23:43 -0600
commit3babc959db12efd794d3620ae7ec051216a8ac5d (patch)
tree21e6af2159d3bf1de012db7eb0f313fe9820b497 /app
parent0bfef4bd83ee62076b4c22ca56d4c1d751ebfc98 (diff)
downloadgitlab-ce-3babc959db12efd794d3620ae7ec051216a8ac5d.tar.gz
Fix tests.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/branches_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 462d4e461e1..2de8ada3e29 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -19,7 +19,7 @@ class Projects::BranchesController < Projects::ApplicationController
respond_to do |format|
format.html
format.json do
- render json: @repository.branch_names.to_json
+ render json: @repository.branch_names
end
end
end