diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-21 23:47:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-21 23:47:42 +0300 |
| commit | ede746bf079dd45ac1e2f701e8a9019dba8e0417 (patch) | |
| tree | 40b6ca4ea39c8268f59df2b3bf8acc41848b9c69 | |
| parent | 4c9e47f6e054649eefd453089d1658b9508c16fc (diff) | |
| download | gitlab-ce-ede746bf079dd45ac1e2f701e8a9019dba8e0417.tar.gz | |
prevent document unbind since it breaks rails ujs
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 1 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/users_groups_controller.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 59dfab8f35b..b96ef65af93 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -53,7 +53,6 @@ window.stopSpinner = -> window.unbindEvents = -> $(document).unbind('scroll') $(document).off('scroll') - $(document).off('click') document.addEventListener("page:fetch", startSpinner) document.addEventListener("page:fetch", unbindEvents) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index f44bc10cf39..416bfa77af0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,6 +1,6 @@ class GroupsController < ApplicationController respond_to :html - before_filter :group, except: [:new, :create, :people] + before_filter :group, except: [:new, :create] # Authorize before_filter :authorize_read_group!, except: [:new, :create] diff --git a/app/controllers/users_groups_controller.rb b/app/controllers/users_groups_controller.rb index ebc79d621a4..9181f1683ae 100644 --- a/app/controllers/users_groups_controller.rb +++ b/app/controllers/users_groups_controller.rb @@ -21,7 +21,7 @@ class UsersGroupsController < ApplicationController @users_group.destroy respond_to do |format| - format.html { redirect_to people_group_path(@group), notice: 'User was successfully removed from group.' } + format.html { redirect_to people_group_path(@group), notice: 'User was successfully removed from group.' } format.js { render nothing: true } end end |