diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-09 04:15:34 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-05-09 04:15:34 +0000 |
| commit | 0151325dacebb99d54b6effb1d5842c0c712168c (patch) | |
| tree | 767ea3c8cfeedab5a0ce1921d5842b149ea7c0be /app/controllers/projects/branches_controller.rb | |
| parent | 9ada13d343a4736275d2c026ee980abe5c5e5763 (diff) | |
| download | gitlab-ce-0151325dacebb99d54b6effb1d5842c0c712168c.tar.gz | |
Merge request widget redesign
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 59247280559..d8ed470e461 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -84,6 +84,7 @@ class Projects::BranchesController < Projects::ApplicationController end format.js { render nothing: true, status: result[:return_code] } + format.json { render json: { message: result[:message] }, status: result[:return_code] } end end |