Commit e3464a54d85062f76439e5a1806fecc37a53cfd8
1 parent
4e878ad9
Exists in
master
and in
4 other branches
Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
5 changed files
with
11 additions
and
16 deletions
Show diff stats
app/assets/javascripts/merge_requests.js.coffee
| @@ -21,7 +21,7 @@ class MergeRequest | @@ -21,7 +21,7 @@ class MergeRequest | ||
| 21 | this.initMergeWidget() | 21 | this.initMergeWidget() |
| 22 | this.$('.show-all-commits').on 'click', => | 22 | this.$('.show-all-commits').on 'click', => |
| 23 | this.showAllCommits() | 23 | this.showAllCommits() |
| 24 | - | 24 | + |
| 25 | modal = $('#modal_merge_info').modal(show: false) | 25 | modal = $('#modal_merge_info').modal(show: false) |
| 26 | 26 | ||
| 27 | # Local jQuery finder | 27 | # Local jQuery finder |
| @@ -83,12 +83,12 @@ class MergeRequest | @@ -83,12 +83,12 @@ class MergeRequest | ||
| 83 | url: this.$('.nav-tabs .diffs-tab a').attr('href') | 83 | url: this.$('.nav-tabs .diffs-tab a').attr('href') |
| 84 | beforeSend: => | 84 | beforeSend: => |
| 85 | this.$('.status').addClass 'loading' | 85 | this.$('.status').addClass 'loading' |
| 86 | - | ||
| 87 | complete: => | 86 | complete: => |
| 88 | @diffs_loaded = true | 87 | @diffs_loaded = true |
| 89 | this.$('.status').removeClass 'loading' | 88 | this.$('.status').removeClass 'loading' |
| 90 | - | ||
| 91 | - dataType: 'script' | 89 | + success: (data) => |
| 90 | + this.$(".diffs").html(data.html) | ||
| 91 | + dataType: 'json' | ||
| 92 | 92 | ||
| 93 | showAllCommits: -> | 93 | showAllCommits: -> |
| 94 | this.$('.first-commits').remove() | 94 | this.$('.first-commits').remove() |
app/controllers/projects/merge_requests_controller.rb
| @@ -2,8 +2,8 @@ require 'gitlab/satellite/satellite' | @@ -2,8 +2,8 @@ require 'gitlab/satellite/satellite' | ||
| 2 | 2 | ||
| 3 | class Projects::MergeRequestsController < Projects::ApplicationController | 3 | class Projects::MergeRequestsController < Projects::ApplicationController |
| 4 | before_filter :module_enabled | 4 | before_filter :module_enabled |
| 5 | - before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status] | ||
| 6 | - before_filter :closes_issues, only: [:edit, :update, :show, :commits, :diffs] | 5 | + before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status] |
| 6 | + before_filter :closes_issues, only: [:edit, :update, :show, :diffs] | ||
| 7 | before_filter :validates_merge_request, only: [:show, :diffs] | 7 | before_filter :validates_merge_request, only: [:show, :diffs] |
| 8 | before_filter :define_show_vars, only: [:show, :diffs] | 8 | before_filter :define_show_vars, only: [:show, :diffs] |
| 9 | 9 | ||
| @@ -26,8 +26,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -26,8 +26,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 26 | def show | 26 | def show |
| 27 | respond_to do |format| | 27 | respond_to do |format| |
| 28 | format.html | 28 | format.html |
| 29 | - format.js | ||
| 30 | - | ||
| 31 | format.diff { render text: @merge_request.to_diff(current_user) } | 29 | format.diff { render text: @merge_request.to_diff(current_user) } |
| 32 | format.patch { render text: @merge_request.to_patch(current_user) } | 30 | format.patch { render text: @merge_request.to_patch(current_user) } |
| 33 | end | 31 | end |
| @@ -44,6 +42,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -44,6 +42,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 44 | diff_line_count = Commit::diff_line_count(@merge_request.diffs) | 42 | diff_line_count = Commit::diff_line_count(@merge_request.diffs) |
| 45 | @suppress_diff = Commit::diff_suppress?(@merge_request.diffs, diff_line_count) && !params[:force_show_diff] | 43 | @suppress_diff = Commit::diff_suppress?(@merge_request.diffs, diff_line_count) && !params[:force_show_diff] |
| 46 | @force_suppress_diff = Commit::diff_force_suppress?(@merge_request.diffs, diff_line_count) | 44 | @force_suppress_diff = Commit::diff_force_suppress?(@merge_request.diffs, diff_line_count) |
| 45 | + | ||
| 46 | + respond_to do |format| | ||
| 47 | + format.html | ||
| 48 | + format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } } | ||
| 49 | + end | ||
| 47 | end | 50 | end |
| 48 | 51 | ||
| 49 | def new | 52 | def new |
app/views/projects/merge_requests/commits.js.haml
app/views/projects/merge_requests/diffs.js.haml
app/views/projects/merge_requests/show.js.haml