summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-11 11:25:40 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-11 11:25:40 +0000
commit69a8bf367c4de56864e0e91a68c185901809921a (patch)
tree11ea632fe48afa36a960618aa1d2700aefbf92b4 /app/controllers/projects
parent986b4a54ee159de56a7ebe51327887b49474813b (diff)
parent12ff7ee93348239d545e0553a49881cfe490420e (diff)
downloadgitlab-ce-69a8bf367c4de56864e0e91a68c185901809921a.tar.gz
Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 49064f5d505..ae613f5e093 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -207,20 +207,20 @@ class Projects::MergeRequestsController < Projects::ApplicationController
#This is always source
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
@commit = @repository.commit(params[:ref]) if params[:ref].present?
+ render layout: false
end
def branch_to
@target_project = selected_target_project
@commit = @target_project.commit(params[:ref]) if params[:ref].present?
+ render layout: false
end
def update_branches
@target_project = selected_target_project
@target_branches = @target_project.repository.branch_names
- respond_to do |format|
- format.js
- end
+ render layout: false
end
def ci_status