summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-29 12:49:19 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-29 12:49:19 +0000
commitbef4294c58e0bbadc01f633fc8bea514801de7ae (patch)
tree0defb579215ca801d08a7ca46c06c4139c52d8e0
parenta4b1fe4de951cb18a061b2be7b85988e6db26f5b (diff)
parent4e1b670f811834dc810ca625a218a02b4cd7202d (diff)
downloadgitlab-ce-bef4294c58e0bbadc01f633fc8bea514801de7ae.tar.gz
Merge branch 'filter-fade-fix' into 'master'
Removed fade when filtering results ## What does this MR do? Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required. Best way to see issue - filter issues & then go back. Will still have opacity styling. See merge request !4932
-rw-r--r--app/assets/javascripts/issuable.js.coffee3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 6a108c033ea..0527c66461c 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -59,13 +59,12 @@ issuable_created = false
filterResults: (form) =>
formData = form.serialize()
- $('.issues-holder, .merge-requests-holder').css('opacity', '0.5')
formAction = form.attr('action')
issuesUrl = formAction
issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}")
issuesUrl += formData
- Turbolinks.visit(issuesUrl);
+ Turbolinks.visit(issuesUrl)
initChecks: ->
@issuableBulkActions = $('.bulk-update').data('bulkActions')