David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00

..

environments

Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00

initializers

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

locales

Fix Japanese translation (#4876)

2017-09-10 20:34:15 +09:00

webpack

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

application.rb

Merge tag 'v1.6.0rc3' into sync/upstream

2017-09-09 14:28:08 -05:00

boot.rb

…

brakeman.ignore

Update status embeds (#4742)

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

database.yml

…

deploy.rb

…

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

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

i18n-tasks.yml

Shorten display of large numbers on public profiles (#4711)

2017-08-27 17:04:45 +02:00

navigation.rb

Fix up the applications area (#4664)

2017-08-23 00:59:35 +02:00

puma.rb

…

routes.rb

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

secrets.yml

…

settings.yml

Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00

sidekiq.yml

Periodically remove expired PuSH subscribers (#4654)

2017-08-21 22:56:33 +02:00

webpacker.yml

…