AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/config
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
webpack Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
application.rb Change locale detection to run once per session (#8657) 2019-07-21 18:08:02 +02:00
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 2018-12-13 05:19:52 +01:00
brakeman.ignore Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
database.yml config: add DB_SSLMODE for managed/remote PG (#10210) 2019-03-08 14:36:28 +01:00
deploy.rb Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01: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 2019-06-10 18:59:53 +02:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
puma.rb Make puma bind address configurable with BIND env var (#11326) 2019-07-16 16:12:01 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02: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 2019-07-19 18:26:49 +02:00
sidekiq.yml Remove WebSub subscriptions (#11303) 2019-07-21 04:08:00 +02:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00