Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
rosa-build/lib
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
..
abf_worker Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
ext Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
modules Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
plugins Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
recipes #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
redcarpet/render [#19] remove reduntant quote 2013-04-09 20:09:55 +06:00
tasks Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
api_defender.rb #192: Checks ip address in api defender 2013-07-04 14:51:36 +04:00
modules.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
plugins.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00