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

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/sessions_controller.rb
index 7ecbaf19301dfe80acc251667378ff8eb8268f08,3e93b2e68d70f3c30148e08aedb4ea89d3ca2c09..c2b38883ba992b9c8ad2ea65bd6a639b3e0b917d
--- 1/app/controllers/auth/sessions_controller.rb
--- 2/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@@ -8,9 -8,6 +8,8 @@@ class Auth::SessionsController < Devise
    skip_before_action :require_no_authentication, only: [:create]
    skip_before_action :require_functional!
  
-   prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]
 +  prepend_before_action :set_pack
 +
    before_action :set_instance_presenter, only: [:new]
    before_action :set_body_classes
  
@@@ -109,12 -92,15 +94,19 @@@
      render :two_factor
    end
  
+   def authenticate_and_respond(user)
+     sign_in(user)
+     remember_me(user)
+ 
+     respond_with user, location: after_sign_in_path_for(user)
+   end
+ 
    private
  
 +  def set_pack
 +    use_pack 'auth'
 +  end
 +
    def set_instance_presenter
      @instance_presenter = InstancePresenter.new
    end

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/javascript/packs/public.js
Simple merge

diff --cc app/presenters/instance_presenter.rb
Simple merge

diff --cc app/services/process_mentions_service.rb
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

diff --cc app/views/admin/tags/index.html.haml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/simple_form.en.yml
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 3cdd0abcb7257b4199afdf8e91679f094e4eb391,24d5fcf9c3f28d57e0d7addeea7d18292903ee7c..97d3ec497c53c310911b038990e8fd1cd06c69ac
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -98,9 -96,9 +98,10 @@@
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
      "file-loader": "^4.2.0",
 +    "favico.js": "^0.3.10",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.1",
+     "history": "^4.10.1",
      "http-link-header": "^1.0.2",
      "immutable": "^3.8.2",
      "imports-loader": "^0.8.0",

diff --cc yarn.lock
Simple merge