Commit Graph

12 Commits

Author SHA1 Message Date
Vokhmin Alexey V 331944e0fd #345: updated keys 2014-03-14 01:36:28 +04:00
Alexander Machehin 81d628c605 [#345] remove deprecation warning 2014-03-12 19:23:39 +06:00
Alexander Machehin 8d0720091a [#345] simplify config 2014-03-12 19:15:06 +06:00
Alexander Machehin d78879c691 [#345] hide devise secret 2014-03-12 10:57:32 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V f903944e6d #30: update scope for github omniauth 2013-03-26 17:43:29 +04:00
Vokhmin Alexey V cd98088e7f #30: find user by email before registration 2013-03-26 17:22:25 +04:00
Vokhmin Alexey V abfe502b5f #30: update devise.rb and omniauth_callbacks_controller 2013-03-26 16:24:15 +04:00
Vokhmin Alexey V c2e89f8781 #30: use omniauth for registration through Facebook, GitHub, Google 2013-03-26 03:13:15 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Vokhmin Alexey V 149f727c81 #906: rewrite devise.rb 2013-03-04 15:16:36 +04:00