Merge branch 'master' into clostridium
* master: Clean up password reset
This commit is contained in:
commit
6a8a4c1a36
7 changed files with 35 additions and 18 deletions
|
@ -24,7 +24,7 @@ export default Ember.Controller.extend({
|
|||
},
|
||||
};
|
||||
ajaxRequest(url, options, this.get('session'));
|
||||
this.transitionTo('protected.users.index');
|
||||
this.transitionToRoute('protected.users.index');
|
||||
this.get('flashMessages').information('Your password has been changed.');
|
||||
},
|
||||
|
||||
|
|
Reference in a new issue