diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 22:24:51 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 22:24:51 +0300 |
| commit | 15bbb4ee1af4b52a8ee68b21ea679dc96b0d58d5 (patch) | |
| tree | 22f164e8a1ffe61920609666d854eecc4e1619bc | |
| parent | 5af7d789f5e6ee11fb51765d6ee6aa99dfcbc47e (diff) | |
| parent | a1152e19d130d153223e00ee4f35d68408f89689 (diff) | |
| download | gitlab-ce-15bbb4ee1af4b52a8ee68b21ea679dc96b0d58d5.tar.gz | |
Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch
Fix Firefox problems when it wants to render issuable component
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 7 | ||||
| -rw-r--r-- | app/views/shared/_issuable_filter.html.haml | 2 |
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() |