diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
| commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
| tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /app/controllers/groups/group_members_controller.rb | |
| parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
| parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
| download | gitlab-ce-aa2a7dad59c0db8b15aadbb58a861237a36c95ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'app/controllers/groups/group_members_controller.rb')
| -rw-r--r-- | app/controllers/groups/group_members_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index d5ef33888c6..48dbf656e84 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -40,7 +40,7 @@ class Groups::GroupMembersController < Groups::ApplicationController respond_to do |format| format.html { redirect_to group_group_members_path(@group), notice: 'User was successfully removed from group.' } - format.js { render nothing: true } + format.js { head :ok } end end |