rosa-build/spec/controllers/platforms
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
..
contents_controller_spec.rb #82: added specs of access rights for controller 2013-07-08 16:08:53 +04:00
key_pairs_controller_spec.rb #291: updated key_pairs_controller_spec 2013-09-02 19:03:31 +04:00
maintainers_controller_spec.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
mass_builds_controller_spec.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
platforms_controller_spec.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
private_users_controller_spec.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
privates_controller_spec.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
product_build_lists_controller_spec.rb #29: merge master into branch 2013-04-03 16:10:22 +04:00
products_controller_spec.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
repositories_controller_spec.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
tokens_controller_spec.rb #192: added request specs 2013-06-26 12:04:40 +04:00