Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream

2023-09-15 21:06:45 +02:00
parent 9f3df3edee b1d8907138
commit 08b495d95c
33 changed files with 759 additions and 327 deletions
@@ -104,6 +104,10 @@ module Mastodon::Snowflake
      id
    end

+    def to_time(id)
+      Time.at((id >> 16) / 1000).utc
+    end
+
    private

    def already_defined?
@@ -9,3 +9,13 @@ if Rake::Task.task_defined?('spec:system')

  Rake::Task['spec:system'].enhance ['spec:enable_system_specs']
 end
+
+if Rake::Task.task_defined?('spec:search')
+  namespace :spec do
+    task :enable_search_specs do # rubocop:disable Rails/RakeEnvironment
+      ENV['RUN_SEARCH_SPECS'] = 'true'
+    end
+  end
+
+  Rake::Task['spec:search'].enhance ['spec:enable_search_specs']
+end