Commit e6f34237 authored by Jacob Schatz's avatar Jacob Schatz

reverting MR ajax changes, which will be in a different MR

parent aaf184bf
......@@ -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) =>
......
......@@ -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?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment