this.initMergeWidget()
this.$('.show-all-commits').on 'click', =>
this.showAllCommits()
-
+
modal = $('#modal_merge_info').modal(show: false)
# Local jQuery finder
url: this.$('.nav-tabs .diffs-tab a').attr('href')
beforeSend: =>
this.$('.status').addClass 'loading'
-
complete: =>
@diffs_loaded = true
this.$('.status').removeClass 'loading'
-
- dataType: 'script'
+ success: (data) =>
+ this.$(".diffs").html(data.html)
+ dataType: 'json'
showAllCommits: ->
this.$('.first-commits').remove()
class Projects::MergeRequestsController < Projects::ApplicationController
before_filter :module_enabled
- before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
- before_filter :closes_issues, only: [:edit, :update, :show, :commits, :diffs]
+ before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status]
+ before_filter :closes_issues, only: [:edit, :update, :show, :diffs]
before_filter :validates_merge_request, only: [:show, :diffs]
before_filter :define_show_vars, only: [:show, :diffs]
def show
respond_to do |format|
format.html
- format.js
-
format.diff { render text: @merge_request.to_diff(current_user) }
format.patch { render text: @merge_request.to_patch(current_user) }
end
diff_line_count = Commit::diff_line_count(@merge_request.diffs)
@suppress_diff = Commit::diff_suppress?(@merge_request.diffs, diff_line_count) && !params[:force_show_diff]
@force_suppress_diff = Commit::diff_force_suppress?(@merge_request.diffs, diff_line_count)
+
+ respond_to do |format|
+ format.html
+ format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
+ end
end
def new