Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00

..

environments

Updated from tootsuite

2017-07-17 20:03:57 +02:00

initializers

Fix sessions being replaced needlessly (#4292)

2017-07-22 01:09:10 +02:00

locales

Update Japanese translations for landing page (for Mobile). (#4362)

2017-07-25 22:57:40 +09:00

webpack

Fix for stylesheet split

2017-07-18 11:28:52 -07:00

application.rb

Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00

boot.rb

…

brakeman.ignore

…

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

…

i18n-tasks.yml

Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)

2017-06-05 01:02:19 +02:00

navigation.rb

Rename "Credentials" page to "Security" for clarity (#3941)

2017-06-25 22:13:02 +02:00

puma.rb

…

routes.rb

Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00

secrets.yml

…

settings.yml

disable about page timeline

2017-07-20 17:26:00 -04:00

sidekiq.yml

Move clean up of unconfirmed users to sidekiq-scheduler (#4336)

2017-07-24 16:17:55 +02:00

webpacker.yml

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

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