diff options
| author | elijah <elijah@riseup.net> | 2014-12-15 16:11:22 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-12-15 16:11:22 -0800 |
| commit | 61ed5d77ba0a6e962e645c72683855510dd0ec05 (patch) | |
| tree | b1dba926db9b9d0e584de5c69f89604741e23ea9 /app/controllers | |
| parent | 546a49e3d59af2565b5b80c9ea5105d4adf0f963 (diff) | |
| parent | 6e15813d549fd9e56a48fd87d425fd31f37521e8 (diff) | |
Merge branch 'develop' into version/0.6
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/v1/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb index d57db6f..2e840d9 100644 --- a/app/controllers/v1/users_controller.rb +++ b/app/controllers/v1/users_controller.rb @@ -30,7 +30,7 @@ module V1 end def destroy - @user.account.destroy + @user.account.destroy(params[:identities] == "destroy") if @user == current_user logout end |