summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordreis <christoph.dreis@innogames.com>2015-05-05 21:52:06 +0200
committerdreis <christoph.dreis@innogames.com>2015-05-05 21:52:06 +0200
commita1152e19d130d153223e00ee4f35d68408f89689 (patch)
treed83cfe3bc71576a1a8f18e94bc526c1c7998829b
parent1132084d3fcbb5623546730a6269b2a5d1c2ada3 (diff)
downloadgitlab-ce-a1152e19d130d153223e00ee4f35d68408f89689.tar.gz
Fix Firefox problems when it wants to render issuable component
-rw-r--r--app/assets/javascripts/dispatcher.js.coffee7
-rw-r--r--app/views/shared/_issuable_filter.html.haml2
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 06787ddf874..2baaf430d98 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -112,6 +112,13 @@ class Dispatcher
new NamespaceSelect()
when 'dashboard'
shortcut_handler = new ShortcutsDashboardNavigation()
+ switch path[1]
+ when 'issues', 'merge_requests'
+ new UsersSelect()
+ when 'groups'
+ switch path[1]
+ when 'issues', 'merge_requests'
+ new UsersSelect()
when 'profiles'
new Profile()
when 'projects'
diff --git a/app/views/shared/_issuable_filter.html.haml b/app/views/shared/_issuable_filter.html.haml
index fa8b4eae314..4ab9421f013 100644
--- a/app/views/shared/_issuable_filter.html.haml
+++ b/app/views/shared/_issuable_filter.html.haml
@@ -51,8 +51,6 @@
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
:coffeescript
- new UsersSelect()
-
$('form.filter-form').on 'submit', (event) ->
event.preventDefault()
Turbolinks.visit @.action + '&' + $(@).serialize()