diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 11:25:40 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 11:25:40 +0000 |
| commit | 69a8bf367c4de56864e0e91a68c185901809921a (patch) | |
| tree | 11ea632fe48afa36a960618aa1d2700aefbf92b4 /app/controllers/projects | |
| parent | 986b4a54ee159de56a7ebe51327887b49474813b (diff) | |
| parent | 12ff7ee93348239d545e0553a49881cfe490420e (diff) | |
| download | gitlab-ce-69a8bf367c4de56864e0e91a68c185901809921a.tar.gz | |
Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request
Closes #2540


See merge request !3228
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
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 |
