David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ...

Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss

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

..

environments

Merge branch 'origin/master' into sync/upstream

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

initializers

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

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

locales

i18n: Update Polish translation (#4845)

2017-09-08 05:51:48 +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

Adds bootsnap. Faster boot time (#3176)

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

brakeman.ignore

Update status embeds (#4742)

2017-08-30 10:23:43 +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

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

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 branch 'origin/master' into sync/upstream

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

secrets.yml

Upgrade to Rails 5.0.0.1

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

settings.yml

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

sidekiq.yml

Periodically remove expired PuSH subscribers (#4654)

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

webpacker.yml

Fix webpack-dev-server on Windows (#4000)

2017-06-30 13:43:26 +02:00