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
..
deploy	#29: update deploy/production.rb.sample	2013-03-18 19:02:09 +04:00
environments	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00
initializers	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00
locales	#328: rename field: new_commit to update_code	2013-11-27 13:28:11 +04:00
puma	Decrease count of workers	2013-12-06 14:10:08 +06:00
application.rb	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +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	#188: added .travis.yml	2013-06-14 17:04:17 +04:00
deploy.rb.sample	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +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
routes.rb	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00
schedule.rb	Merge branch 'master' into 29-migrate-to-ruby-2.1	2014-01-10 08:31:31 +06:00
unicorn.rb	Rollback changes	2013-11-27 20:35:01 +04:00