donphan

Author	SHA1	Message	Date
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	2018-05-19 22:41:10 +02:00
Eugen Rochko	8378b72eba	Ensure push subscription is immediately removed when application is revoked (#7548 ) * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too	2018-05-19 21:05:08 +02:00
David Yip	204688e803	Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.	2017-12-11 00:17:30 -06:00
Eugen Rochko	4b621188ad	Fix #1165 - before_action was called before protect_from_forgery	2017-04-08 02:30:50 +02:00
Eugen Rochko	e3a3422a65	Allow setting of default language through config Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	2017-04-07 12:40:26 +02:00