Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
environments	Use sendmail in production	2020-04-19 15:34:45 +02:00
initializers	Use Rolify for admin and moderator roles	2020-04-19 22:35:58 +02:00
late_initializers	i'm about to give up	2015-08-26 02:26:47 +05:30
locales	Re-add locales and service docs	2017-03-29 22:32:36 +02:00
application.rb	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
boot.rb	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
cable.yml	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
database.yml.postgres	boost connection pool	2014-12-12 22:50:54 +01:00
environment.rb	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
flags.yml	Flag switcher	2015-06-21 12:33:29 +05:30
hl_to_cc.yml	Flag switcher	2015-06-21 12:33:29 +05:30
i18n-js.yml	Fix JS translations	2017-04-02 09:04:49 +02:00
justask.yml.example	Remove Rollbar	2020-04-19 17:20:07 +02:00
newrelic.yml	Add New Relic	2017-06-17 22:49:19 +02:00
puma.rb	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
routes.rb	Merge branch 'master' into feature/announcements	2020-04-19 21:52:58 +01:00
secrets.yml	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
sidekiq.yml	remove rollbar queue, use mailers queue for mail stuff	2020-04-19 15:00:50 +02:00
spring.rb	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00