thredded 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cde941264a9f9b9427694c27cc5f2a668fd18debbfe459d3fc58087e5636bf
-  data.tar.gz: 0d4eec1e395f2265783f9283ad958ec2a7f486a017bb961af87b26c2fd711c20
+  metadata.gz: be8026fdf40f38f7143784b548e10f87d2606358ae302e81f536713feb0c59a6
+  data.tar.gz: abcbc174119805d870fd2c51b6985524b0f9123dccdfcd26b8e206417b04b333
 SHA512:
-  metadata.gz: f7d6aa4fd6d1eaecda06e839b757d6fa2bbf7fd24ae6ef4ba3c238a5d8880baeff1be6b9ee2aae21b34c8f844d0aa5eb5c41a1f70e7841cbe867a900e29b980a
-  data.tar.gz: 04af99833299683e35b13468e957bd75880a1627db1ff6c9ab53e1678f99842b273cc50ed529c9cddeedb7600c0d54b404550fd8858a7901346d6c72df77bdb2
+  metadata.gz: c74687299ccd1435304a97057d7c2430e6c1af13bf3f62ef63a1d6fdcd811d67225782337ccc5018d97cb4cee34bfbb5d9231d0fcd041351eed8a93984ca783e
+  data.tar.gz: df93c85e83e7c7be26eeb8ece54167ae279ad5988fd21693a287922e492c0ddcbb25e75bbe3c460dda2cfaa991c2f7801a5eae4bb96083ceacfdada8ccccb7eb

data/README.md

@@ -1,6 +1,8 @@
-# Thredded [![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded) [![Travis-CI](https://api.travis-ci.org/thredded/thredded.svg?branch=main)](https://travis-ci.org/thredded/thredded/) [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=main)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+# Thredded
+[![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded)  [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=main)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![CI](https://github.com/thredded/thredded/actions/workflows/build.yml/badge.svg)](https://github.com/thredded/thredded/actions/workflows/build.yml)
 
-_Thredded_ is a Rails 6.0+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
+_Thredded_ is a Rails 7.0+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
 
 Some of the features currently in Thredded:
 
@@ -21,10 +23,10 @@ Some of the features currently in Thredded:
 
 Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. Thredded has no infrastructure
 dependencies other than the database and, if configured in the parent application, the ActiveJob
-backend dependency such as Redis. Currently only MRI Ruby 2.2+ is supported. We would love to
+backend dependency such as Redis. Currently only MRI Ruby 3.1+ is supported. We would love to
 support JRuby and Rubinius as well.
 
-If you're looking for variations on a theme - see [Discourse]. However, It is a full rails
+If you're looking for variations on a theme - see [Discourse]. However, it is a full rails
 application and not an engine like Thredded.
 
 [Discourse]: http://www.discourse.org/
@@ -78,7 +80,15 @@ Table of Contents
 
 ### Creating a new Rails app with Thredded
 
-Thredded provides an app generator that will generate a Rails app with Thredded, Devise, SimpleForm, RSpec, 
+> [!CAUTION]
+> Please add thredded_create_app is currently out of date and needs contributors to fix it - it won't work with the latest thredded. See https://github.com/thredded/thredded_create_app if you can contribute.
+
+<details>
+<summary>
+View the outdated instructions
+</summary>
+
+Thredded provides an app generator that will generate a Rails app with Thredded, Devise, SimpleForm, RSpec,
 PostgreSQL, and a basic theme and navigation that is configured to work out of the box.
 
 ```sh
@@ -92,12 +102,14 @@ Then, see the rest of this Readme for more information about using and customizi
 
 [thredded_create_app repo]: https://github.com/thredded/thredded_create_app
 
+</details>
+
 ### Adding Thredded to an existing Rails app
 
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 1.1'
+gem 'thredded', '~> 1.2'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -158,11 +170,13 @@ to Thredded.
 
 ## Rails compatibility
 
-| Rails  | Latest Thredded  |
-| ------------- |------------------|
-| Rails 6.0+ | Thredded 1.1+    |
-| Rails 5.2  | Thredded 1.0.1   |
-| Rails 4.2  | Thredded 0.16.16 |
+| Rails                 | Latest Thredded |
+|-----------------------|-----------------|
+| Rails 7.0 - Rails 8.0 | Thredded 1.2    |
+| Rails 6.1             | Thredded 1.1    |
+| Rails 6.0             | Thredded 1.1    |
+| Rails 5.2             | Thredded 1.0.1  |
+| Rails 4.2             | Thredded 0.16.16 |
 
 
 ## Views and other assets
@@ -257,8 +271,7 @@ which are placed in the same order as in the source).
 
 <details><summary><b>Rails UJS version</b></summary>
 
-By default, thredded loads `rails-ujs`. If you're using Rails before v5.1, you need to add `rails-ujs` to
-your Gemfile.
+By default, thredded loads `rails-ujs`.
 
 If you'd like it to use `jquery_ujs` instead, run this command from your app directory:
 
@@ -332,7 +345,7 @@ Whenever possible, use the styles and i18n to customize Thredded to your needs.
 Thredded provides view hooks to customize the UI before/after/replacing individual components.
 
 View hooks allow you to render anything in the thredded view context.
-For example, to render a partial after the post content textarea, add the snippet below to 
+For example, to render a partial after the post content textarea, add the snippet below to
 the `config/initializers/thredded.rb` initializer:
 
 ```ruby
@@ -393,7 +406,7 @@ You can also turn off the email notifier totally, or add other notifiers (e.g. P
 the `Thredded.notifiers` configuration in your initializer. See the default initializer for examples.
 
 You must configure the address the email appears to be from (`Thredded.email_from`). This address is also used as the "To" address for both email notifcations, as all the recipients are on bcc.
- 
+
 ### Enabling auto-follow
 
 In some cases, you'll want all users to auto-follow new messageboard topics by default. This might be useful
@@ -423,16 +436,16 @@ Here are the steps to ensure the best support for your language if it isn't Engl
    //= require timeago/locales/de
    //= require timeago/locales/pt_BR
    //= require thredded
-   ```                 
-   
+   ```
+
    Webpack:
-   
+
    ```erb
    <% timeago_root = File.join(Gem.loaded_specs['timeago_js'].full_gem_path, 'assets', 'javascripts') %>
    import "<%= File.join(timeago_root, 'timeago.js') %>";
    <%= %w[de pt_BR].map { |locale| %(import "#{File.join(timeago_root, "timeago/locales/#{locale}.js")}";) } * "\n" %>
    <%= Thredded::WebpackAssets.javascripts %>
-   ```   
+   ```
 
    Note that it is important that timeago and its locales are required *before* Thredded.
 
@@ -701,9 +714,9 @@ brew install --cask chromium
 brew install --cask chromedriver
 ```
 
-To get better page saves (`page.save_and_open_page`) from local capybara specs ensure you are running the server locally 
-and set `export CAPYBARA_ASSET_HOST=http://localhost:3000` (or whatever host/port your server is on) before running your 
-test suite.  
+To get better page saves (`page.save_and_open_page`) from local capybara specs ensure you are running the server locally
+and set `export CAPYBARA_ASSET_HOST=http://localhost:3000` (or whatever host/port your server is on) before running your
+test suite.
 
 ### Ruby
 
@@ -796,25 +809,23 @@ To quickly try out _Thredded_ with the included dummy app, clone the source and
 start the included docker-compose.yml file with:
 
 ```console
-docker-compose build
-docker-compose up
+docker compose build
+docker compose up
 ```
 
 The above will build and run everything, daemonized, resulting in a running
-instance on port 9292. Running `docker-compose logs` will let you know when
+instance on port 9292. Running `docker compose logs` will let you know when
 everything is up and running. Editing the source on your host machine will
 be reflected in the running docker'ized application.
 
-Note that when using [boot2docker](https://github.com/boot2docker/boot2docker)
-on a Mac make sure you visit the boot2docker host ip at
-`http://$(boot2docker ip):9292`.
-
-After booting up the containers you can run the test suite with the following:
+You can run the test suite with the following (assuming you've already done `docker compose up`)
 
 ```console
-docker-compose run web bundle exec rake
+docker compose exec web bundle exec rake
 ```
 
-The docker container uses PostgreSQL.
+Alternatively you run a one-off dyno `docker compose run web bundle exec rake`
+
+The docker container uses PostgreSQL
 
 [initializer]: https://github.com/thredded/thredded/blob/main/lib/generators/thredded/install/templates/initializer.rb

data/app/models/concerns/thredded/moderation_state.rb

@@ -7,7 +7,7 @@ module Thredded
     extend ActiveSupport::Concern
 
     included do
-      enum moderation_state: %i[pending_moderation approved blocked]
+      enum :moderation_state, { pending_moderation: 0, approved: 1, blocked: 2 }
       validates :moderation_state, presence: true
     end
   end

data/app/models/concerns/thredded/topics_search.rb

@@ -15,7 +15,7 @@ module Thredded
         @scope = @scope.joins(:topic_categories).merge(Thredded::TopicCategory.where(category_id: categories))
       end
       if text.present? || users.present?
-        [search_topics, search_posts].compact.reduce(:union)
+        Thredded::Topic.union_scope(search_topics, search_posts)
       else
         @scope
       end

data/app/models/concerns/thredded/union_scope.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# simplified version of active_record_union https://github.com/brianhempel/active_record_union/blob/master/lib/active_record_union/active_record/relation/union.rb
+
+module Thredded
+  module UnionScope
+    extend ActiveSupport::Concern
+    class_methods do
+      # @param left_relation [ActiveRecord::Relation]
+      # @param right_relation [ActiveRecord::Relation]
+      # @return [ActiveRecord::Relation]
+      def union_scope(left_relation, right_relation)
+        verify_relations!(left_relation, right_relation)
+        union_set = ArelCompat.union_new(self, left_relation.arel, right_relation.arel)
+        from_table = Arel::Nodes::TableAlias.new(union_set, arel_table.name)
+        unscoped.from(from_table)
+      end
+
+      private
+
+      def verify_relations!(left_relation, right_relation)
+        relations = [left_relation, right_relation]
+        includes_relations = relations.select { |r| r.includes_values.any? }
+
+        fail ArgumentError, 'Cannot union relation with includes.' if includes_relations.any?
+
+        preload_relations = relations.select { |r| r.preload_values.any? }
+        fail ArgumentError, 'Cannot union relation with preload.' if preload_relations.any?
+
+        eager_load_relations = relations.select { |r| r.eager_load_values.any? }
+        return unless eager_load_relations.any?
+
+        fail ArgumentError, 'Cannot union relation with eager load.'
+      end
+    end
+  end
+end

data/app/models/thredded/post_moderation_record.rb

@@ -3,7 +3,9 @@
 module Thredded
   class PostModerationRecord < ActiveRecord::Base
     include Thredded::ModerationState
-    enum previous_moderation_state: moderation_states, _prefix: :previous
+
+    enum :previous_moderation_state, moderation_states, prefix: :previous
+
     validates :previous_moderation_state, presence: true
 
     scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }

data/app/models/thredded/topic.rb

@@ -4,6 +4,7 @@ module Thredded
   class Topic < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     include Thredded::TopicCommon
     include Thredded::ContentModerationState
+    include Thredded::UnionScope
 
     scope :for_messageboard, ->(messageboard) { where(messageboard_id: messageboard.id) }
 
@@ -85,6 +86,8 @@ module Thredded
 
     delegate :name, to: :messageboard, prefix: true
 
+    before_create :ensure_last_post_at
+
     after_commit :update_messageboard_last_topic, on: :update, if: -> { previous_changes.include?('moderation_state') }
     after_commit :update_last_user_and_time_from_last_post!, if: -> { previous_changes.include?('moderation_state') }
 
@@ -203,5 +206,9 @@ module Thredded
         Thredded::Messageboard.find(messageboard_id).update_last_topic!
       end
     end
+
+    def ensure_last_post_at
+      self.last_post_at ||= Time.zone.now
+    end
   end
 end

data/app/models/thredded/user_topic_follow.rb

@@ -2,7 +2,7 @@
 
 module Thredded
   class UserTopicFollow < ActiveRecord::Base
-    enum reason: %i[manual posted mentioned auto]
+    enum :reason, { manual: 0, posted: 1, mentioned: 2, auto: 3 }
 
     belongs_to :user, inverse_of: :thredded_topic_follows, class_name: Thredded.user_class_name
     belongs_to :topic, inverse_of: :user_follows
@@ -12,7 +12,8 @@ module Thredded
 
     # shim to behave like postable-related (though actually only ever related to topic)
     alias_attribute :postable_id, :topic_id
-    alias_attribute :postable, :topic
+    alias postable topic
+    alias postable= topic=
 
     # Creates a follow or finds the existing one.
     #

data/config/locales/uk.yml

@@ -0,0 +1,284 @@
+---
+uk:
+  thredded:
+    content_moderation_states:
+      content_blocked_notice: Заблоковано
+      content_blocked_notice_with_record_html: Заблоковано користувачем %{moderator} %{time_ago}
+    email_notifier:
+      by_email: електронною поштою
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Цей електронний лист надіслано вам, оскільки %{user} включив вас до приватної теми "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: 'Нове повідомлення від %{user} в <a href="%{post_url}">«%{topic_title}»</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Нове повідомлення від %{user} в «%{topic_title}»
+        text:
+          email_sent_reason: |-
+            Цей електронний лист надіслано вам, оскільки %{user} включив вас до
+            приватної теми «%{topic_title}».
+
+            Перейдіть сюди, щоб переглянути розмову:
+            %{post_url}
+          post_lead: 'Нове повідомлення від %{user} в «%{topic_title}»:'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: >-
+            Цей електронний лист надіслано вам, оскільки ви стежите за цією темою: "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: '%{user} <a href="%{post_url}">написав у «%{topic_title}»</a>:'
+          unsubscribe_instructions_html: Щоб відписатися від цих електронних листів, оновіть свої <a href="%{preferences_url}">налаштування</a>.
+        subject: Новий допис у «%{topic_title}»
+        text:
+          email_sent_reason: |-
+            Цей електронний лист надіслано вам, оскільки ви стежите за
+            темою «%{topic_title}».
+
+            Перейдіть сюди, щоб переглянути розмову:
+            %{post_url}
+          post_lead: "%{user} написав у «%{topic_title}»:"
+          unsubscribe_instructions: |-
+            Щоб відписатися від цих електронних листів, оновіть свої налаштування тут:
+            %{unsubscribe_url}
+    errors:
+      login_required: Будь ласка, увійдіть спочатку.
+      not_authorized: Ви не маєте дозволу на доступ до цієї сторінки.
+      post_not_found: Цей допис не існує.
+      private_post_not_found: Це приватне повідомлення не існує.
+      private_topic_create_denied: Ви не маєте дозволу на створення приватних тем.
+      private_topic_not_found: Ця приватна тема не існує.
+      topic_not_found: Ця тема не існує.
+    form:
+      create_btn_submitting: Створення...
+      preview: Попередній перегляд
+      update: Оновити
+      update_btn_submitting: Оновлення...
+    messageboard:
+      create: Створити нову дошку повідомлень
+      deleted_notice: Дошку повідомлень видалено
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Видалити дошку повідомлень
+        delete_confirm: >-
+          Це видалить дошку повідомлень %{messageboard_name} та всі її дописи. Ви не зможете відновити її. Ви впевнені,
+          що хочете це зробити?
+        description_label: Опис
+        locked_label: Заблоковано
+        locked_notice: Ця дошка повідомлень заблокована. Лише модератори можуть створювати нові теми тут.
+        messageboard_group_id_label: Група дошки повідомлень
+        no_group: Без групи
+        title_label: Назва
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      index:
+        page_title: Дошки повідомлень
+      last_updated_by_html: Оновлено %{time_ago} <cite>користувачем %{user}</cite>
+      topics_and_posts_counts: "%{posts_count} дописів у %{topics_count} темах"
+      topics_and_unread_topics_counts: "%{unread_topics_count} непрочитаних з %{topics_count} тем"
+      update: :thredded.form.update
+      updated_notice: Дошку повідомлень оновлено
+    messageboard_first_topic:
+      content: |-
+        Поки що тут не так багато.
+
+        Ці форуми працюють на [Thredded](https://github.com/thredded/thredded) v%{thredded_version}.
+        Ви можете зв'язатися з командою Thredded через [чат-кімнату Thredded](https://gitter.im/thredded/thredded).
+        Будь ласка, повідомте нам, що ви використовуєте Thredded, твітнувши [@thredded](https://twitter.com/thredded)!
+      title: Ласкаво просимо до першої теми вашої дошки повідомлень
+    messageboard_group:
+      create: Створити нову групу дошок повідомлень
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
+      saved: Групу дошок повідомлень %{name} створено
+      show:
+        page_title: 'Група дошок повідомлень: %{name}'
+    moderation:
+      approve_btn: Схвалити
+      block_btn: Заблокувати
+      moderation_state:
+        name: Стан модерації
+      pending:
+        empty:
+          content: Усі дописи пройшли модерацію.
+          title: Гарна робота!
+      post_approved_html: Допис схвалено користувачем %{moderator} %{time_ago}.
+      post_blocked_html: Допис заблоковано користувачем %{moderator} %{time_ago}.
+      post_deleted_notice: Цей допис було видалено.
+      posts_content_changed_since_moderation_html: Вміст <a href="%{post_url}">допису</a> змінився після модерації.
+        Нижче наведено вміст на момент модерації.
+      search_users:
+        form_label: Пошук користувачів
+        form_placeholder: :thredded.moderation.search_users.form_label
+        no_results_message: Немає користувачів, ім'я яких починається з %{query}
+        results_message: Користувачі з іменами, що починаються з %{query}
+      user:
+        name: Користувач
+    nav:
+      all_messageboards: Усі дошки повідомлень
+      edit_messageboard: Редагувати дошку повідомлень
+      edit_post: Редагувати допис
+      edit_private_topic: :thredded.nav.edit_topic
+      edit_topic: Редагувати
+      mark_all_read: Позначити все як прочитане
+      moderation: Модерація
+      moderation_activity: Активність
+      moderation_history: Історія
+      moderation_pending: Очікує
+      moderation_users: Користувачі
+      private_topics: Приватні повідомлення
+      settings: Налаштування сповіщень
+      sign_in: Увійти / Зареєструватися
+      sign_out: Вийти
+      unread_topics: Непрочитані
+    null_user_name: Видалений користувач
+    posts:
+      delete: Видалити допис
+      delete_confirm: Ви впевнені, що хочете видалити цей допис?
+      deleted_notice: Ваш допис видалено.
+      edit: :thredded.nav.edit_post
+      form:
+        content_label: Вміст
+        create_btn: Надіслати відповідь
+        create_btn_submitting: Публікація...
+        title_label: Додати допис
+        update_btn: Оновити допис
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      pending_moderation_notice: Ваш допис буде опубліковано після перевірки модератором.
+      quote_btn: Цитувати
+      spoiler_summary: Спойлер - натисніть, щоб показати.
+      spoiler_summary_for_email: 'Спойлер - виділіть вміст нижче, щоб побачити:'
+    preferences:
+      edit:
+        page_title: :thredded.nav.settings
+      form:
+        auto_follow_topics:
+          hint: Автоматично стежити за всіма новими темами. Зміна цього налаштування змінить його для всіх дошок
+            повідомлень.
+          label: Стежити за всіма новими темами
+        follow_topics_on_mention:
+          hint: 'Коли хтось згадує вас за вашим ім''ям користувача (наприклад: @sam), ви будете стежити за темою.'
+          label: Стежити за темами, в яких вас згадують
+        messageboard_auto_follow_topics:
+          hint: >-
+            Автоматично стежити за всіма новими темами на цій дошці повідомлень. Це перевизначає відповідне налаштування
+            вище.
+          label: Стежити за всіма новими темами
+        messageboard_follow_topics_on_mention:
+          hint: >-
+            Коли хтось згадує вас за вашим ім'ям користувача (наприклад: @sam) на цій дошці повідомлень, ви будете
+            стежити за темою.
+          label: :thredded.preferences.form.follow_topics_on_mention.label
+        messageboard_notifications_for_followed_topics:
+          label: :thredded.preferences.form.notifications_for_followed_topics.label
+        notifications_for_followed_topics:
+          label: Сповіщення для тем, за якими ви стежите
+        notifications_for_private_topics:
+          label: Сповіщення для приватних повідомлень
+        submit_btn: Оновити налаштування
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Глобальні налаштування
+      messageboard_preferences_nav_title: Налаштування дошки повідомлень
+      messageboard_preferences_title_html: Налаштування для <em>%{messageboard}</em>
+      updated_notice: Ваші налаштування оновлено.
+    private_posts:
+      form:
+        content_label: Повідомлення
+        create_btn: Надіслати повідомлення
+        create_btn_submitting: Надсилання...
+        update_btn_submitting: :thredded.form.update_btn_submitting
+    private_topics:
+      create: :thredded.private_topics.form.create_btn
+      edit: Редагувати
+      errors:
+        user_ids_length: Будь ласка, вкажіть принаймні одного іншого користувача.
+      form:
+        content_label: :thredded.private_posts.form.content_label
+        create_btn: :thredded.private_posts.form.create_btn
+        create_btn_submitting: :thredded.private_posts.form.create_btn_submitting
+        title_label: :thredded.topics.form.title_label
+        title_placeholder_new: Напишіть тему цієї розмови
+        title_placeholder_start: Почати нову розмову
+        update_btn: Оновити
+        update_btn_submitting: :thredded.private_posts.form.update_btn_submitting
+        users_label: Учасники
+        users_placeholder: Виберіть користувачів для участі в цій розмові
+      no_private_topics:
+        create_btn: Почати першу приватну розмову
+        title: У вас немає приватних повідомлень.
+      updated_notice: Назву оновлено
+    recent_activity: Нещодавня активність
+    search:
+      form:
+        btn_submit: :thredded.search.form.label
+        label: Пошук
+        placeholder: Пошук тем і дописів
+    time_ago: "%{time} тому"
+    topics:
+      create: :thredded.topics.form.create_btn
+      delete_confirm: Ви впевнені, що хочете видалити цю тему? Це НЕ МОЖНА скасувати.
+      delete_topic: Видалити тему
+      deleted_notice: Тему видалено
+      edit: Редагувати тему
+      follow: Стежити за цією темою
+      followed_by: 'Стежать:'
+      followed_by_noone: Ніхто не стежить за цією темою
+      followed_notice: Тепер ви стежите за цією темою
+      following:
+        auto: Ви стежите за цією темою, оскільки увімкнено автоматичне стеження.
+        manual: Ви стежите за цією темою.
+        mentioned: Ви стежите за цією темою, оскільки вас у ній згадували.
+        posted: Ви стежите за цією темою, оскільки ви в ній писали.
+      form:
+        categories_placeholder: Категорії
+        content_label: :thredded.posts.form.content_label
+        create_btn: Створити нову тему
+        messageboard_label: Дошка повідомлень
+        title_label: Назва
+        title_placeholder: :thredded.topics.form.title_label
+        title_placeholder_start: Почати нову тему
+        update_btn: Оновити тему
+      in_messageboard_html: в %{messageboard_link}
+      locked:
+        label: Заблоковано
+        message: Цю тему заблоковано модератором.
+      mark_as_unread: Позначити як непрочитане звідси
+      not_following: Ви не стежите за цією темою.
+      search:
+        no_results_in_messageboard_message_html: Немає результатів для вашого пошуку <q>%{query}</q> в %{messageboard}
+        no_results_message_html: Немає результатів для вашого пошуку <q>%{query}</q>
+        page_title: Результати пошуку тем
+        results_in_messageboard_message_html: Результати пошуку для <q>%{query}</q> в %{messageboard}
+        results_message_html: Результати пошуку для <q>%{query}</q>
+        search_in_all_messageboards_btn: Шукати всюди
+      started_by_html: Створено %{time_ago} користувачем %{user}
+      sticky:
+        label: Закріплено
+      unfollow: Припинити стеження
+      unfollowed_notice: Ви більше не стежите за цією темою
+      updated_notice: Тему оновлено
+    unread_topics:
+      empty:
+        content: Ви прочитали все, що є. Поверніться пізніше за новим контентом!
+        title: Все прочитано!
+      page_title: Непрочитані теми
+      page_title_in_messageboard: "%{messageboard}: Непрочитані теми"
+    users:
+      currently_online: Зараз онлайн
+      last_active_html: Остання активність %{time_ago}
+      posted_in_topic_html: Написав у %{topic_link}
+      posts_count:
+        few: Написав %{count} рази
+        many: Написав %{count} разів
+        one: Написав один раз
+        other: Написав %{count} разів
+      recent_activity: :thredded.recent_activity
+      send_private_message: Надіслати приватне повідомлення
+      started_topic_html: Створив %{topic_link}
+      started_topics_count:
+        few: Створив %{count} теми
+        many: Створив %{count} тем
+        one: Створив %{count} тему
+        other: Створив %{count} тем
+      user_posted_in_topic_html: "%{user_link} написав у %{topic_link}"
+      user_since_html: Користувач з %{time_ago}
+      user_started_topic_html: "%{user_link} створив %{topic_link}"

data/lib/thredded/arel_compat.rb

@@ -15,5 +15,21 @@ module Thredded
         Arel::Nodes::Division.new(a, b)
       end
     end
+
+    # @param [#connection] engine_or_model_class
+    # @param [Arel::Nodes::Node] left
+    # @param [Arel::Nodes::Node] right
+    # @return [Arel::Nodes::Node] union of left and right
+    # extract and simplified from https://github.com/brianhempel/active_record_union/blob/master/lib/active_record_union/active_record/relation/union.rb
+    def union_new(engine_or_model_class, left, right)
+      if /sqlite/i.match?(engine_or_model_class.connection.adapter_name)
+        # Postgres allows ORDER BY in the UNION subqueries if each subquery is surrounded by parenthesis
+        # but SQLite does not allow parens around the subqueries
+        Arel::Nodes::Union.new(left.ast, right.ast)
+      else
+        # By default this adds parentheses which sqlite does not allow
+        Arel::Nodes::Union.new(left, right)
+      end
+    end
   end
 end

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -60,16 +60,16 @@ module Thredded
       digest_path = digest_path_from_template(view, template)
 
       collection.each_with_object([{}, []]) do |item, (hash, ordered_keys)|
-        key = expanded_cache_key(item, view, template, digest_path)
+        key = expanded_cache_key(item, view, digest_path)
         ordered_keys << key
         hash[key] = item
       end
     end
 
-    def expanded_cache_key(key, view, template, digest_path)
+    def expanded_cache_key(key, view, digest_path)
       key = combined_fragment_cache_key(
         view,
-        cache_fragment_name(view, key, virtual_path: template.virtual_path, digest_path: digest_path)
+        cache_fragment_name(view, key, digest_path: digest_path)
       )
       key.frozen? ? key.dup : key # #read_multi & #write may require mutability, Dalli 2.6.0.
     end
@@ -106,22 +106,15 @@ module Thredded
       end
     end
 
-    if Thredded::Compat.rails_gte_61?
-      # @param [Array<Object>] collection
-      # @param [Hash] opts
-      # @param view_context
-      # @return [Array<String>]
-      def render_partials_serial(view_context, collection, opts)
-        # https://github.com/rails/rails/pull/38594
-        collection.map do |object|
-          renderer = ActionView::ObjectRenderer.new(@lookup_context, opts)
-          renderer.render_object_with_partial(object, opts[:partial], view_context, nil).body
-        end
-      end
-    else
-      def render_partials_serial(view_context, collection, opts)
-        partial_renderer = ActionView::PartialRenderer.new(@lookup_context)
-        collection.map { |object| render_partial(partial_renderer, view_context, **opts.merge(object: object)) }
+    # @param [Array<Object>] collection
+    # @param [Hash] opts
+    # @param view_context
+    # @return [Array<String>]
+    def render_partials_serial(view_context, collection, opts)
+      # https://github.com/rails/rails/pull/38594
+      collection.map do |object|
+        renderer = ActionView::ObjectRenderer.new(@lookup_context, opts)
+        renderer.render_object_with_partial(object, opts[:partial], view_context, nil).body
       end
     end
 
@@ -133,12 +126,8 @@ module Thredded
       view.combined_fragment_cache_key(key)
     end
 
-    def cache_fragment_name(view, key, virtual_path:, digest_path:)
-      if Thredded::Compat.rails_gte_61?
-        view.cache_fragment_name(key, digest_path: digest_path)
-      else
-        view.cache_fragment_name(key, virtual_path: virtual_path, digest_path: digest_path)
-      end
+    def cache_fragment_name(view, key, digest_path:)
+      view.cache_fragment_name(key, digest_path: digest_path)
     end
 
     def digest_path_from_template(view, template)

data/lib/thredded/compat.rb

@@ -4,25 +4,23 @@ module Thredded
   module Compat
     class << self
       # @api private
-      def rails_gte_61?
-        @rails_gte_61 = (Rails.gem_version >= Gem::Version.new('6.1.0')) if @rails_gte_61.nil?
-        @rails_gte_61
+      def rails_gte_71?
+        @rails_gte_71 = (Rails.gem_version >= Gem::Version.new('7.1.0')) if @rails_gte_71.nil?
+        @rails_gte_71
       end
 
-      if Rails.gem_version >= Gem::Version.new('7.0.0')
-        # @api private
-        def association_preloader(records:, associations:, scope:)
-          ActiveRecord::Associations::Preloader.new(
-            records: records, associations: associations, scope: scope
-          ).call
-        end
-      else
-        # @api private
-        def association_preloader(records:, associations:, scope:)
-          ActiveRecord::Associations::Preloader.new.preload(
-            records, associations, scope
-          )
-        end
+      # @api private
+      def rails_gte_72?
+        @rails_gte_72 = (Rails.gem_version >= Gem::Version.new('7.2.0')) if @rails_gte_72.nil?
+        @rails_gte_72
+      end
+
+      # @api private
+      # TODO: inline this or put it somewhere else as it's no longer specific to a rails version
+      def association_preloader(records:, associations:, scope:)
+        ActiveRecord::Associations::Preloader.new(
+          records: records, associations: associations, scope: scope
+        ).call
       end
     end
   end

data/lib/thredded/database_seeder.rb

@@ -10,6 +10,7 @@ rescue NameError
 end
 # rubocop:enable HandleExceptions
 module Thredded
+  # rubocop:disable Metrics/MethodLength
   class DatabaseSeeder # rubocop:disable Metrics/ClassLength
     module LogTime
       def self.included(base)
@@ -60,8 +61,16 @@ module Thredded
     def self.with_seeder_tweaks
       # Disable callbacks to avoid creating notifications and performing unnecessary updates
       DISABLE_COUNTER_CACHE.each do |klass|
-        klass.send(:alias_method, :original_each_counter_cached_associations, :each_counter_cached_associations)
-        klass.send(:define_method, :each_counter_cached_associations) {}
+        if Thredded::Compat.rails_gte_72?
+          klass.class_eval do
+            class_attribute :original_counter_cached_association_names
+            self.original_counter_cached_association_names = counter_cached_association_names
+            self.counter_cached_association_names = []
+          end
+        else
+          klass.send(:alias_method, :original_each_counter_cached_associations, :each_counter_cached_associations)
+          klass.send(:define_method, :each_counter_cached_associations) {}
+        end
       end
       SKIP_CALLBACKS.each { |(klass, *args)| delete_callbacks(klass, *args) }
       WRITEABLE_READONLY_ATTRIBUTES.each { |(klass, attr)| klass.readonly_attributes.delete(attr) }
@@ -71,9 +80,15 @@ module Thredded
     ensure
       # Re-enable callbacks and counter cache
       DISABLE_COUNTER_CACHE.each do |klass|
-        klass.send(:remove_method, :each_counter_cached_associations)
-        klass.send(:alias_method, :each_counter_cached_associations, :original_each_counter_cached_associations)
-        klass.send(:remove_method, :original_each_counter_cached_associations)
+        if Thredded::Compat.rails_gte_72?
+          klass.class_eval do
+            self.counter_cached_association_names = original_counter_cached_association_names
+          end
+        else
+          klass.send(:remove_method, :each_counter_cached_associations)
+          klass.send(:alias_method, :each_counter_cached_associations, :original_each_counter_cached_associations)
+          klass.send(:remove_method, :original_each_counter_cached_associations)
+        end
       end
       SKIP_CALLBACKS.each do |(klass, *args)|
         args = args.dup
@@ -150,9 +165,7 @@ module Thredded
     end
 
     def user_details
-      @user_details ||= users.each_with_object({}) do |user, hash|
-        hash[user] = user.thredded_user_detail
-      end
+      @user_details ||= users.index_with(&:thredded_user_detail)
     end
 
     def first_messageboard
@@ -175,7 +188,7 @@ module Thredded
       end
     end
 
-    log_method_time def update_messageboards_data(**) # `**` for Ruby < 2.5, see https://bugs.ruby-lang.org/issues/10856
+    log_method_time def update_messageboards_data(**)
       log 'Updating messageboards data...'
       Messageboard.all.each do |messageboard|
         messageboard.update_last_topic!
@@ -330,7 +343,7 @@ module Thredded
     class FirstMessageboard < FirstSeedData
       MODEL_CLASS = Messageboard
 
-      log_method_time def create(**) # `**` for Ruby < 2.5, see https://bugs.ruby-lang.org/issues/10856
+      log_method_time def create(**)
         log 'Creating a messageboard...'
         @first_messageboard = FactoryBot.create(
           :messageboard,
@@ -384,7 +397,8 @@ module Thredded
     class Posts < CollectionSeedData
       MODEL_CLASS = Post
 
-      log_method_time def create(count: (1..1), topics: seeder.topics) # rubocop:disable Metrics/MethodLength
+      log_method_time def create(count: (1..1), topics: seeder.topics)
+        # rubocop:disable Metrics/MethodLength
         log "Creating #{count} additional posts in each topic..."
         topics.flat_map do |topic|
           last_post_at = random_duration(0..256.hours).ago
@@ -446,4 +460,5 @@ module Thredded
       end
     end
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/lib/thredded/db_tools.rb

@@ -10,7 +10,7 @@ module Thredded
         verbose_was = ActiveRecord::Migration.verbose
         ActiveRecord::Migration.verbose = !quiet
         migrate =
-          -> { ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration).migrate(nil, &filter) }
+          -> { ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter) }
         if quiet
           silence_active_record(&migrate)
         else

data/lib/thredded/engine.rb

@@ -20,5 +20,17 @@ module Thredded
         thredded_manifest.js
       ]
     end
+
+    config.after_initialize do |app|
+      next unless Rails.env.development? || Rails.env.test?
+      next unless app.config.assets.compile && app.assets
+
+      if app.assets.preprocessors.keys.exclude?('text/scss')
+        fail [
+          'Thredded requires a Sass compiler to be registered in Sprockets.',
+          %(Please add "sassc-rails" or "dartsass-sprockets" to your application Gemfile.),
+        ].join(' ')
+      end
+    end
   end
 end

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '1.1.0'
+  VERSION = '1.2.1'
 end

data/lib/thredded.rb

@@ -2,7 +2,6 @@
 
 # Backend
 require 'pundit'
-require 'active_record_union'
 require 'db_text_search'
 require 'friendly_id'
 require 'html/pipeline'
@@ -29,7 +28,6 @@ require 'thredded/users_provider'
 require 'autoprefixer-rails'
 require 'timeago_js'
 require 'sprockets/es6'
-require 'sassc-rails'
 
 require 'thredded/version'
 require 'thredded/compat'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,22 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: active_record_union
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: db_text_search
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +113,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails_gravatar
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +144,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,6 +154,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -249,20 +241,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets-es6
   requirement: !ruby/object:Gem::Requirement
@@ -291,342 +269,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2.2
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capybara-screenshot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cuprite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.2
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails-controller-testing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: http_accept_language
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails_email_preview
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: twemoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: web-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thredded-markdown_coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thredded-markdown_katex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |-
   The best Rails 6.0+ forums engine ever. Its goal is to be as simple and feature rich as possible.
   Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at https://thredded.org/.
@@ -795,6 +437,7 @@ files:
 - app/models/concerns/thredded/search_parser.rb
 - app/models/concerns/thredded/topic_common.rb
 - app/models/concerns/thredded/topics_search.rb
+- app/models/concerns/thredded/union_scope.rb
 - app/models/concerns/thredded/user_topic_read_state_common.rb
 - app/models/thredded/category.rb
 - app/models/thredded/messageboard.rb
@@ -989,6 +632,7 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/uk.yml
 - config/locales/zh-CN.yml
 - config/routes.rb
 - db/migrate/20160329231848_create_thredded.rb
@@ -1048,7 +692,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'
@@ -1058,7 +702,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: The best Rails forums engine ever.