You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers/auth
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
8 years ago
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
omniauth_callbacks_controller.rb CAS + SAML authentication feature (#6425) 8 years ago
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago