diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-02 14:27:36 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-02 14:27:36 +0200 |
| commit | e3464a54d85062f76439e5a1806fecc37a53cfd8 (patch) | |
| tree | 7bf98bbe2c3288912803747c29e6c080599725f2 /app/assets/javascripts/merge_requests.js.coffee | |
| parent | 4e878ad902c8026513e69f2ed79b6ed17b63ed24 (diff) | |
| download | gitlab-ce-e3464a54d85062f76439e5a1806fecc37a53cfd8.tar.gz | |
Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/javascripts/merge_requests.js.coffee')
| -rw-r--r-- | app/assets/javascripts/merge_requests.js.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
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() |