diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 14:44:07 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-12 14:44:07 -0500 |
| commit | e6f34237bc85f6347a895526179498c56c866970 (patch) | |
| tree | 58ae22cdf7a9911814cdd3efdc44a7818c08559e | |
| parent | aaf184bfa643d748cce42a4cf524642c6e77dc6e (diff) | |
| download | gitlab-ce-e6f34237bc85f6347a895526179498c56c866970.tar.gz | |
reverting MR ajax changes, which will be in a different MR
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 5 | ||||
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index f0a687f79b1..738ffc8343b 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -28,9 +28,8 @@ class @MergeRequestWidget getMergeStatus: -> $.get @opts.url_to_automerge_check, (data) -> - console.log("data",data); - # $('div.mr-state-widget.mr-state-widget-opened').replaceWith(data) - + $('.mr-state-widget').replaceWith(data) + getCiStatus: -> if @opts.ci_enable $.get @opts.url_to_ci_check, (data) => diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 6306450ca26..1dd07a2a220 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -19,19 +19,6 @@ module MergeRequestsHelper } end - def merge_request_button_visibility(mr, closed) - return 'hidden' if mr.closed? == closed - end - - def merge_request_widget_visibility(mr, *states) - states.each do |state| - if mr.state == state - return - end - end - return 'hidden' - end - def mr_css_classes(mr) classes = "merge-request" classes << " closed" if mr.closed? |