Claire c901ae77d4 Merge branch 'main' into glitch-soc/merge-upstream

2021-04-05 14:31:07 +02:00

..

environments

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

2021-03-24 10:53:50 +01:00

initializers

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

2021-04-05 14:31:07 +02:00

locales

Add system checks to dashboard in admin UI (#15989)

2021-04-03 14:12:30 +02:00

locales-glitch

…

webpack

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

2021-01-06 18:08:06 +01:00

application.rb

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

boot.rb

Add clean error message when RAILS_ENV is unset (#15381)

2020-12-20 18:05:03 +01:00

brakeman.ignore

Fix some ignored brakeman warnings (#15829)

2021-03-07 07:06:56 +01:00

database.yml

…

deploy.rb

Bump capistrano from 3.15.0 to 3.16.0 (#15818)

2021-03-05 06:38:52 +09:00

environment.rb

…

i18n-tasks.yml

…

navigation.rb

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

2021-02-22 15:23:46 +01:00

pghero.yml

…

puma.rb

…

routes.rb

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

2021-04-05 14:31:07 +02:00

secrets.yml

…

settings.yml

Change default site title to not point to dev.glitch.social

2021-01-27 14:45:45 +01:00

sidekiq.yml

Fix to isolate the sidekiq process that runs the scheduler job (#15314)

2020-12-15 03:04:03 +01:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

…