Mastodon

Files

Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

environments

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-05 11:36:41 +02:00

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

webpack

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-19 21:49:35 +02:00

application.rb

Fix authentication before 2FA challenge (#11943 )

2019-09-24 04:35:36 +02:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

Bump capistrano from 3.11.0 to 3.11.1 (#11731 )

2019-09-05 12:04:45 +09:00

environment.rb

…

i18n-tasks.yml

…

navigation.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

puma.rb

Add PERSISTENT_TIMEOUT option (#11756 )

2019-09-04 20:44:08 +02:00

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-19 21:49:35 +02:00

sidekiq.yml

2019-09-02 18:11:13 +02:00

webpacker.yml

…