Commit Graph

7 Commits

Author SHA1 Message Date
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
Alexander Machehin e6ceeab4fd [#253] add extra build for platform repositories to mass builds 2013-08-02 18:53:56 +06:00
Vokhmin Alexey V fb0e623e0b #156: added specs for MassBuildController, some refactoring, updated access rights 2013-06-05 17:48:11 +04:00
Vokhmin Alexey V 4f895ef54c #156: removed duplicates 2013-06-05 12:27:07 +04:00
Vokhmin Alexey V 237bd6affb #156: update UI of MassBuild#new BuildList#new 2013-06-04 23:59:08 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Vokhmin Alexey V cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00