Merge branch 'master' into clostridium

* master:
  Clean up password reset
This commit is contained in:
Matthew Dillon 2015-10-27 16:20:20 -07:00
commit 6a8a4c1a36
7 changed files with 35 additions and 18 deletions

View file

@ -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.');
},