Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

v1

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

2019-04-01 21:28:31 +02:00

v2

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

web

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

base_controller_spec.rb

…

oembed_controller_spec.rb

…

proofs_controller_spec.rb

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00

push_controller_spec.rb

…

salmon_controller_spec.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

subscriptions_controller_spec.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00