rosa-build/lib/ext/rails
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
..
render_errors_in_forms.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
reserved_name_validator.rb reorder reserved names 2013-05-06 23:50:16 +06:00
url_for.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00