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

Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
2018-08-24 13:34:51 +02:00
parent 0ddf439999 a2cabf3f4a
commit 246c313d45
52 changed files with 534 additions and 282 deletions
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -512,7 +512,7 @@ RSpec.describe User, type: :model do
      context 'when user is confirmed' do
        let(:confirmed_at) { Time.zone.now }

-        it { is_expected.to be false }
+        it { is_expected.to be true }
      end

      context 'when user is not confirmed' do