Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.

2020-12-15 14:27:06 +01:00

..

environments

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

2020-07-15 15:32:40 +02:00

initializers

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

2020-12-15 14:27:06 +01:00

locales

Add "invite request content" display in user account admin page (#15265)

2020-12-15 06:28:14 +01:00

locales-glitch

Glitchsoc translation to 'es' language (#1439)

2020-10-19 22:17:29 +02:00

webpack

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

2020-11-07 18:23:02 +01:00

application.rb

Fix streaming API allowing connections to persist after access token invalidation (#15111)

2020-11-12 23:05:24 +01:00

boot.rb

Fix bootsnap cache directory being declared relatively (#9511)

2018-12-13 05:19:52 +01:00

brakeman.ignore

Fix performance on instances list in admin UI (#15282)

2020-12-14 09:06:34 +01:00

database.yml

config: add DB_SSLMODE for managed/remote PG (#10210)

2019-03-08 14:36:28 +01:00

deploy.rb

Bump capistrano from 3.14.0 to 3.14.1 (#14037)

2020-06-17 06:31:30 +02:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

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

i18n-tasks.yml

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

2020-07-01 19:23:14 +02:00

navigation.rb

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

2020-10-21 19:10:50 +02:00

pghero.yml

Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)

2020-05-04 13:52:41 +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

2020-11-20 13:27:48 +01:00

secrets.yml

Upgrade to Rails 5.0.0.1

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

settings.yml

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

2020-12-15 14:27:06 +01:00

sidekiq.yml

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

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

webpacker.yml

Do not try to parse gif files as CSS or JS

2019-03-16 14:23:50 +01:00