rosa-build/config/initializers
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
..
a_app_config.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
airbrake.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
backtrace_silencers.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
devise.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
inflections.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
jsroutes.rb #251: configure JsRoutes 2013-08-05 22:03:03 +04:00
localeapp.rb Fixed: uninitialized constant Localeapp 2013-11-09 01:23:36 +04:00
logentries.rb added logglier gem 2013-11-07 01:22:13 +04:00
logglier.rb Temporally disable logglier 2013-11-27 20:20:06 +04:00
mime_types.rb Merge branch 'master' into 29-migrate-to-ruby-2.1 2014-01-10 08:31:31 +06:00
notifications.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
omniauth.rb #327: rollback changes 2013-11-25 21:09:14 +04:00
rack_throttle.rb [refs #374] Patch Rack::Throttle http_error method. Finish main page 2012-09-19 19:02:54 +04:00
resque.rb Rename and separate queues. Refs #510 2012-06-18 17:16:53 +03:00
secret_token.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
session_store.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
setup.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00