Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' ... Conflicts: db/schema.rb		2015-02-07 18:42:34 -08:00
..
accounts_controller.rb	Move profile account to separate controller	2013-10-09 16:43:17 +03:00
avatars_controller.rb	Expire event cache on avatar creation/removal	2013-12-11 09:30:22 -06:00
emails_controller.rb	Allow notification email to be set separately from primary email.	2015-02-07 23:19:17 +01:00
groups_controller.rb	Huge replace of old users_project and users_group references	2014-09-14 19:32:51 +03:00
keys_controller.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
notifications_controller.rb	Allow notification email to be set separately from primary email.	2015-02-07 23:19:17 +01:00
passwords_controller.rb	Require current password even if password was expired	2014-07-29 15:28:20 +03:00