Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
rosa-build/app/controllers/users
History
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
..
base_controller.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
omniauth_callbacks_controller.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
profile_controller.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
register_requests_controller.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
registrations_controller.rb try to stop bots (part2) 2013-08-28 21:15:28 +06:00
settings_controller.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
ssh_keys_controller.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
users_controller.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00