Merge diffs from master

app/controllers/session_controller.rb

@@ -382,7 +382,7 @@ class SessionController < ApplicationController
       @error = I18n.t('user_api_key.invalid_token')
     end
 
-    return render json: { error: I18n.t('email_login.invalid_token') }
+    render layout: 'no_ember'
   end
 
   def forgot_password

app/controllers/user_avatars_controller.rb

@@ -45,6 +45,7 @@ class UserAvatarsController < ApplicationController
     params.require(:color)
     params.require(:version)
     params.require(:size)
+
     hijack do
       begin
         proxy_avatar("https://avatars.discourse.org/#{params[:version]}/letter/#{params[:letter]}/#{params[:color]}/#{params[:size]}.png", Time.new('1990-01-01'))

lib/backup_restore/backuper.rb

@@ -48,8 +48,6 @@ module BackupRestore
       log "Finalizing backup..."
 
       @with_uploads ? create_archive : move_dump_backup
-
-      unpause_sidekiq
       upload_archive
 
       after_create_hook

spec/components/search_spec.rb

@@ -1259,19 +1259,6 @@ describe Search do
       results = Search.execute('in:title status:open Discourse')
       expect(results.posts.length).to eq(1)
     end
-
-    it 'works irrespective of the order' do
-      topic = Fabricate(:topic, title: "A topic about Discourse")
-      Fabricate(:post, topic: topic, raw: "This is another post")
-      topic2 = Fabricate(:topic, title: "This is another topic")
-      Fabricate(:post, topic: topic2, raw: "Discourse is awesome")
-
-      results = Search.execute('Discourse in:title status:open')
-      expect(results.posts.length).to eq(1)
-
-      results = Search.execute('in:title status:open Discourse')
-      expect(results.posts.length).to eq(1)
-    end
   end
 
   context 'ignore_diacritics' do