David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

..

environments

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

initializers

Remove timestamps on any option (#5282)

2017-10-09 17:52:02 +02:00

locales

Add up-to-date korean translation on serverside (#5400)

2017-10-15 23:08:30 +02:00

webpack

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

application.rb

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

boot.rb

Adds bootsnap. Faster boot time (#3176)

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

brakeman.ignore

Set snowflake IDs for backdated statuses (#5260)

2017-10-08 17:34:34 +02:00

database.yml

fix unnecessary variable (#3947)

2017-06-25 23:29:22 +02:00

deploy.rb

Update Capistrano lock version in config/deploy.rb (#4352)

2017-07-25 01:14:01 +02:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

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

i18n-tasks.yml

Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)

2017-09-25 04:04:04 +02:00

navigation.rb

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02: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 upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

secrets.yml

Upgrade to Rails 5.0.0.1

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

settings.yml

Better themeing support!!

2017-09-25 19:24:32 -07: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