Alexander Machehin a81b5fc69e Merge branch 'master' into 345-update_to_rails4 ... Conflicts: Gemfile Gemfile.lock		2014-03-07 16:25:32 +06:00
..
deploy	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00
environments	[#345] update gems	2014-03-06 13:44:14 +06:00
initializers	cleanup	2014-02-26 01:51:11 +04:00
locales	[#247] remove private users	2014-03-06 17:24:33 +06:00
puma	rollback changes	2014-02-12 12:34:31 +04:00
application.rb	Merge branch 'master' into 345-update_to_rails4	2014-03-07 16:25:32 +06:00
application.yml.sample	#321: small fixes, added specs	2013-11-15 23:02:19 +04:00
application.yml.travis	abf/abf-worker#16: update Redis server for live logs	2013-07-30 16:39:43 +04:00
boot.rb	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00
database.yml.sample	[#29] add host to database.yml	2014-01-10 09:30:45 +06:00
deploy.rb.sample	Add skype notifications	2014-03-06 21:45:33 +06:00
environment.rb	#29: removed hack for encoding	2013-03-18 15:36:16 +04:00
google.yml	Initial commit	2011-03-09 16:13:36 +03:00
newrelic.yml.sample	Updated config/newrelic.yml.sample	2013-11-28 18:28:44 +04:00
production.pill	Rename and separate queues. Refs #510	2012-06-18 17:16:53 +03:00
resque_schedule.yml	Fixed: cleaning of old queues	2014-02-27 23:25:37 +04:00
routes.rb	[#247] remove private users	2014-03-06 17:24:33 +06:00
schedule.rb	Cleanup	2014-02-27 00:50:39 +04:00
unicorn.rb	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00