David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

..

environments

add memorial to production.rb

2017-11-03 12:34:50 -04:00

initializers

Allow specifying STATSD_NAMESPACE (#5700)

2017-11-15 07:22:43 +09:00

locales

Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

webpack

Themed prefetching

2017-11-16 21:37:08 -08:00

application.rb

Merge tag 'v2.0.0' into gs-master

2017-10-18 11:52:04 -05:00

boot.rb

Adds bootsnap. Faster boot time (#3176)

2017-05-20 19:42:27 +02:00

brakeman.ignore

Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)

2017-11-07 14:49:32 +01:00

database.yml

use-DB_NAME-in-development (#5430)

2017-10-17 11:45:37 +02:00

deploy.rb

Update dependencies for Ruby (2017-10-30) (#5566)

2017-10-31 12:22:32 +01:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

navigation.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

puma.rb

Do not set port for puma if it is bound to unix socket (#2289)

2017-04-22 01:22:20 +02:00

routes.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

sidekiq.yml

Randomize sidekiq-scheduler cron schedule (#4980)

2017-09-17 11:58:20 +02:00

webpacker.yml

Upgrade Webpacker to version 3.0.1 (#5122)

2017-09-27 14:41:54 +02:00