From e3464a54d85062f76439e5a1806fecc37a53cfd8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Dec 2013 14:27:36 +0200
Subject: [PATCH] Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/javascripts/merge_requests.js.coffee | 8 ++++----
app/controllers/projects/merge_requests_controller.rb | 11 +++++++----
app/views/projects/merge_requests/commits.js.haml | 4 ----
app/views/projects/merge_requests/diffs.js.haml | 2 --
app/views/projects/merge_requests/show.js.haml | 2 --
5 files changed, 11 insertions(+), 16 deletions(-)
delete mode 100644 app/views/projects/merge_requests/commits.js.haml
delete mode 100644 app/views/projects/merge_requests/diffs.js.haml
delete mode 100644 app/views/projects/merge_requests/show.js.haml
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 5400bc5c1ad..2eef7df1c64 100644
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -21,7 +21,7 @@ class MergeRequest
this.initMergeWidget()
this.$('.show-all-commits').on 'click', =>
this.showAllCommits()
-
+
modal = $('#modal_merge_info').modal(show: false)
# Local jQuery finder
@@ -83,12 +83,12 @@ class MergeRequest
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()
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 0cc09caf1d2..2f285f8ba85 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -2,8 +2,8 @@ require 'gitlab/satellite/satellite'
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]
@@ -26,8 +26,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
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
@@ -44,6 +42,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
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
diff --git a/app/views/projects/merge_requests/commits.js.haml b/app/views/projects/merge_requests/commits.js.haml
deleted file mode 100644
index 923b1ea032f..00000000000
--- a/app/views/projects/merge_requests/commits.js.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-:plain
- merge_request.$(".commits").html("#{escape_javascript(render(partial: "commits"))}");
-
-
diff --git a/app/views/projects/merge_requests/diffs.js.haml b/app/views/projects/merge_requests/diffs.js.haml
deleted file mode 100644
index 2964f0ec462..00000000000
--- a/app/views/projects/merge_requests/diffs.js.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:plain
- merge_request.$(".diffs").html("#{escape_javascript(render(partial: "projects/merge_requests/show/diffs"))}");
diff --git a/app/views/projects/merge_requests/show.js.haml b/app/views/projects/merge_requests/show.js.haml
deleted file mode 100644
index 2ce6eb63290..00000000000
--- a/app/views/projects/merge_requests/show.js.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:plain
- merge_request.$(".notes").html("#{escape_javascript(render "notes/notes_with_form")}");
--
GitLab