Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-21 16:36:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2453 from TracksApp/dependabot/bundler/aasm-5.1.1

Browse source 
Bump aasm from 4.12.3 to 5.1.1
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-25 17:55:28 +03:00 • committed by GitHub
commit 0e5da18b71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 51 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/preferences_controller.rb
View file

@ -9,8 +9,8 @@ class PreferencesController < ApplicationController
def update
@prefs = current_user.prefs
@user = current_user
user_updated = current_user.update_attributes(user_params)
prefs_updated = current_user.preference.update_attributes(prefs_params)
user_updated = current_user.update(user_params)
prefs_updated = current_user.preference.update(prefs_params)
if (user_updated && prefs_updated)
if params['user']['password'].present? # password updated?
logout_user t('preferences.password_changed')