discourse: 3.1.0.beta4 -> 3.1.0

}@args:

let

  version = "3.1.0.beta4";

  version = "3.1.0";

  src = fetchFromGitHub {

    owner = "discourse";

    repo = "discourse";

    rev = "v${version}";

    sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";

    sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY=";

  };

  ruby = ruby_3_2;

    yarnOfflineCache = fetchYarnDeps {

      yarnLock = src + "/app/assets/javascripts/yarn.lock";

      sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";

      sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj";

    };

    nativeBuildInputs = runtimeDeps ++ [

  # this allows us to include the bits of rails we use without pieces we do not.

  #

  # To issue a rails update bump the version number here

  rails_version = "7.0.4.3"

  rails_version = "7.0.5.1"

  gem "actionmailer", rails_version

  gem "actionpack", rails_version

  gem "actionview", rails_version

gem "omniauth-google-oauth2"

# pending: https://github.com/ohler55/oj/issues/789

gem "oj", "3.13.14"

gem "oj"

gem "pg"

gem "mini_sql"

  gem "selenium-webdriver", require: false

  gem "test-prof"

  gem "webdrivers", require: false

  gem "rails-dom-testing", require: false

end

group :test, :development do

  gem "rspec-rails"

  gem "shoulda-matchers", require: false

  gem "shoulda-matchers", require: false, github: "thoughtbot/shoulda-matchers"

  gem "rspec-html-matchers"

  gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri

  gem "rubocop-discourse", require: false

# https://github.com/ruby/net-imap/issues/16#issuecomment-803086765

gem "net-http"

# workaround for prometheus-client

gem "webrick", require: false

# Workaround until Ruby ships with cgi version 0.3.6 or higher.

gem "cgi", ">= 0.3.6", require: false

      concurrent-ruby (~> 1.0)

      rack (> 1, < 3)

GIT

  remote: https://github.com/thoughtbot/shoulda-matchers.git

  revision: 783a90554053002017510285bc736099b2749c22

  specs:

    shoulda-matchers (5.3.0)

      activesupport (>= 5.2.0)

GEM

  remote: https://rubygems.org/

  specs:

    actionmailer (7.0.4.3)

      actionpack (= 7.0.4.3)

      actionview (= 7.0.4.3)

      activejob (= 7.0.4.3)

      activesupport (= 7.0.4.3)

    actionmailer (7.0.5.1)

      actionpack (= 7.0.5.1)

      actionview (= 7.0.5.1)

      activejob (= 7.0.5.1)

      activesupport (= 7.0.5.1)

      mail (~> 2.5, >= 2.5.4)

      net-imap

      net-pop

      net-smtp

      rails-dom-testing (~> 2.0)

    actionpack (7.0.4.3)

      actionview (= 7.0.4.3)

      activesupport (= 7.0.4.3)

      rack (~> 2.0, >= 2.2.0)

    actionpack (7.0.5.1)

      actionview (= 7.0.5.1)

      activesupport (= 7.0.5.1)

      rack (~> 2.0, >= 2.2.4)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.2.0)

    actionview (7.0.4.3)

      activesupport (= 7.0.4.3)

    actionview (7.0.5.1)

      activesupport (= 7.0.5.1)

      builder (~> 3.1)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

      actionview (>= 6.0.a)

    active_model_serializers (0.8.4)

      activemodel (>= 3.0)

    activejob (7.0.4.3)

      activesupport (= 7.0.4.3)

    activejob (7.0.5.1)

      activesupport (= 7.0.5.1)

      globalid (>= 0.3.6)

    activemodel (7.0.4.3)

      activesupport (= 7.0.4.3)

    activerecord (7.0.4.3)

      activemodel (= 7.0.4.3)

      activesupport (= 7.0.4.3)

    activesupport (7.0.4.3)

    activemodel (7.0.5.1)

      activesupport (= 7.0.5.1)

    activerecord (7.0.5.1)

      activemodel (= 7.0.5.1)

      activesupport (= 7.0.5.1)

    activesupport (7.0.5.1)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)

      aws-sigv4 (~> 1.1)

    aws-sigv4 (1.5.0)

      aws-eventstream (~> 1, >= 1.0.2)

    better_errors (2.9.1)

      coderay (>= 1.0.0)

    better_errors (2.10.1)

      erubi (>= 1.0.0)

      rack (>= 0.9.0)

      rouge (>= 1.0.0)

    binding_of_caller (1.0.0)

      debug_inspector (>= 0.0.1)

    bootsnap (1.16.0)

      activesupport (>= 3.0.0)

      uniform_notifier (~> 1.11)

    byebug (11.1.3)

    capybara (3.39.0)

    capybara (3.39.2)

      addressable

      matrix

      mini_mime (>= 0.1.3)

    coderay (1.1.3)

    colored2 (3.1.2)

    concurrent-ruby (1.2.2)

    connection_pool (2.4.0)

    connection_pool (2.4.1)

    cose (1.3.0)

      cbor (~> 0.5.9)

      openssl-signature_algorithm (~> 1.0)

      faker (~> 2.16)

      literate_randomizer

    docile (1.4.0)

    ecma-re-validator (0.4.0)

      regexp_parser (~> 2.2)

    email_reply_trimmer (0.1.13)

    erubi (1.12.0)

    excon (0.99.0)

    excon (0.100.0)

    execjs (2.8.1)

    exifr (1.3.10)

    exifr (1.4.0)

    fabrication (2.30.0)

    faker (2.23.0)

      i18n (>= 1.8.11, < 2)

    fakeweb (1.3.0)

    faraday (2.7.4)

    faraday (2.7.10)

      faraday-net_http (>= 2.0, < 3.1)

      ruby2_keywords (>= 0.0.4)

    faraday-net_http (3.0.2)

    faraday-retry (2.1.0)

    faraday-retry (2.2.0)

      faraday (~> 2.0)

    fast_blank (1.0.1)

    fast_xs (0.8.0)

    fastimage (2.2.6)

    fastimage (2.2.7)

    ffi (1.15.5)

    fspath (3.1.2)

    gc_tracer (1.5.1)

    globalid (1.1.0)

      activesupport (>= 5.0)

    google-protobuf (3.22.3)

    google-protobuf (3.23.4)

    guess_html_encoding (0.0.11)

    hana (1.3.7)

    hashdiff (1.0.1)

    hkdf (1.0.0)

    htmlentities (4.3.4)

    http_accept_language (2.1.1)

    i18n (1.12.0)

    i18n (1.14.1)

      concurrent-ruby (~> 1.0)

    image_optim (0.31.3)

      exifr (~> 1.2, >= 1.2.2)

      image_size (>= 1.5, < 4)

      in_threads (~> 1.3)

      progress (~> 3.0, >= 3.0.1)

    image_size (3.2.0)

    image_size (3.3.0)

    in_threads (1.6.0)

    jmespath (1.6.2)

    json (2.6.3)

    json-schema (3.0.0)

      addressable (>= 2.8)

    json_schemer (0.2.23)

      ecma-re-validator (~> 0.3)

    json_schemer (1.0.3)

      hana (~> 1.3)

      regexp_parser (~> 2.0)

      uri_template (~> 0.7)

    jwt (2.7.0)

      simpleidn (~> 0.2)

    jwt (2.7.1)

    kgio (2.11.4)

    libv8-node (16.10.0.0)

    language_server-protocol (3.17.0.3)

    libv8-node (18.16.0.0)

    listen (3.8.0)

      rb-fsevent (~> 0.10, >= 0.10.3)

      rb-inotify (~> 0.9, >= 0.9.10)

    literate_randomizer (0.4.0)

    lograge (0.12.0)

    lograge (0.13.0)

      actionpack (>= 4)

      activesupport (>= 4)

      railties (>= 4)

    logstash-logger (0.26.1)

      logstash-event (~> 1.2)

    logster (2.12.2)

    loofah (2.20.0)

    loofah (2.21.3)

      crass (~> 1.0.2)

      nokogiri (>= 1.5.9)

      nokogiri (>= 1.12.0)

    lru_redux (1.1.0)

    lz4-ruby (0.3.3)

    mail (2.8.1)

    matrix (0.4.2)

    maxminddb (0.1.22)

    memory_profiler (1.0.1)

    message_bus (4.3.2)

    message_bus (4.3.7)

      rack (>= 1.1.3)

    method_source (1.0.0)

    mini_mime (1.1.2)

    mini_portile2 (2.8.1)

    mini_racer (0.6.3)

      libv8-node (~> 16.10.0.0)

    mini_scheduler (0.15.0)

    mini_portile2 (2.8.4)

    mini_racer (0.8.0)

      libv8-node (~> 18.16.0.0)

    mini_scheduler (0.16.0)

      sidekiq (>= 4.2.3, < 7.0)

    mini_sql (1.4.0)

    mini_suffix (0.3.3)

      ffi (~> 1.9)

    minitest (5.18.0)

    mocha (2.0.2)

    minitest (5.19.0)

    mocha (2.1.0)

      ruby2_keywords (>= 0.0.5)

    msgpack (1.7.0)

    msgpack (1.7.2)

    multi_json (1.15.0)

    multi_xml (0.6.0)

    mustache (1.1.1)

    net-http (0.3.2)

      uri

    net-imap (0.3.4)

    net-imap (0.3.7)

      date

      net-protocol

    net-pop (0.1.2)

    net-smtp (0.3.3)

      net-protocol

    nio4r (2.5.9)

    nokogiri (1.14.3)

      mini_portile2 (~> 2.8.0)

    nokogiri (1.15.3)

      mini_portile2 (~> 2.8.2)

      racc (~> 1.4)

    oauth (1.1.0)

      oauth-tty (~> 1.0, >= 1.0.1)

      multi_json (~> 1.3)

      multi_xml (~> 0.5)

      rack (>= 1.2, < 4)

    oj (3.13.14)

    oj (3.15.1)

    omniauth (1.9.2)

      hashie (>= 3.4.6)

      rack (>= 1.6.2, < 3)

    openssl (3.1.0)

    openssl-signature_algorithm (1.3.0)

      openssl (> 2.0)

    optimist (3.0.1)

    parallel (1.22.1)

    parallel_tests (4.2.0)

    optimist (3.1.0)

    parallel (1.23.0)

    parallel_tests (4.2.1)

      parallel

    parser (3.2.2.0)

    parser (3.2.2.3)

      ast (~> 2.4.1)

      racc

    pg (1.4.6)

    prettier_print (1.2.1)

    progress (3.6.0)

      pry (>= 0.13, < 0.15)

    pry-rails (0.3.9)

      pry (>= 0.10.4)

    public_suffix (5.0.1)

    puma (6.2.1)

    public_suffix (5.0.3)

    puma (6.3.0)

      nio4r (~> 2.0)

    racc (1.6.2)

    rack (2.2.6.4)

    racc (1.7.1)

    rack (2.2.8)

    rack-mini-profiler (3.1.0)

      rack (>= 1.2.0)

    rack-protection (3.0.6)

      rack

    rack-test (2.1.0)

      rack (>= 1.3)

    rails-dom-testing (2.0.3)

      activesupport (>= 4.2.0)

    rails-dom-testing (2.1.1)

      activesupport (>= 5.0.0)

      minitest

      nokogiri (>= 1.6)

    rails-html-sanitizer (1.5.0)

      loofah (~> 2.19, >= 2.19.1)

    rails_failover (1.0.0)

      activerecord (> 6.0, < 7.1)

    rails-html-sanitizer (1.6.0)

      loofah (~> 2.21)

      nokogiri (~> 1.14)

    rails_failover (2.0.1)

      activerecord (>= 6.1, <= 7.1)

      concurrent-ruby

      railties (> 6.0, < 7.1)

    rails_multisite (4.0.1)

      activerecord (> 5.0, < 7.1)

      railties (> 5.0, < 7.1)

    railties (7.0.4.3)

      actionpack (= 7.0.4.3)

      activesupport (= 7.0.4.3)

      railties (>= 6.1, <= 7.1)

    rails_multisite (5.0.0)

      activerecord (>= 6.0)

      railties (>= 6.0)

    railties (7.0.5.1)

      actionpack (= 7.0.5.1)

      activesupport (= 7.0.5.1)

      method_source

      rake (>= 12.2)

      thor (~> 1.0)

      optimist (>= 3.0.0)

    rchardet (1.8.0)

    redis (4.8.1)

    redis-namespace (1.10.0)

    redis-namespace (1.11.0)

      redis (>= 4)

    regexp_parser (2.8.0)

    regexp_parser (2.8.1)

    request_store (1.5.1)

      rack (>= 1.4)

    rexml (3.2.5)

    rexml (3.2.6)

    rinku (2.0.6)

    rotp (6.2.2)

    rqrcode (2.1.2)

    rouge (4.1.3)

    rqrcode (2.2.0)

      chunky_png (~> 1.0)

      rqrcode_core (~> 1.0)

    rqrcode_core (1.2.0)

      rspec-core (~> 3.12.0)

      rspec-expectations (~> 3.12.0)

      rspec-mocks (~> 3.12.0)

    rspec-core (3.12.1)

    rspec-core (3.12.2)

      rspec-support (~> 3.12.0)

    rspec-expectations (3.12.2)

    rspec-expectations (3.12.3)

      diff-lcs (>= 1.2.0, < 2.0)

      rspec-support (~> 3.12.0)

    rspec-html-matchers (0.10.0)

      nokogiri (~> 1)

      rspec (>= 3.0.0.a)

    rspec-mocks (3.12.5)

    rspec-mocks (3.12.6)

      diff-lcs (>= 1.2.0, < 2.0)

      rspec-support (~> 3.12.0)

    rspec-rails (6.0.1)

    rspec-rails (6.0.3)

      actionpack (>= 6.1)

      activesupport (>= 6.1)

      railties (>= 6.1)

      rspec-core (~> 3.11)

      rspec-expectations (~> 3.11)

      rspec-mocks (~> 3.11)

      rspec-support (~> 3.11)

    rspec-support (3.12.0)

      rspec-core (~> 3.12)

      rspec-expectations (~> 3.12)

      rspec-mocks (~> 3.12)

      rspec-support (~> 3.12)

    rspec-support (3.12.1)

    rss (0.2.9)

      rexml

    rswag-specs (2.8.0)

    rswag-specs (2.10.1)

      activesupport (>= 3.1, < 7.1)

      json-schema (>= 2.2, < 4.0)

      railties (>= 3.1, < 7.1)

      rspec-core (>= 2.14)

    rtlcss (0.2.0)

      mini_racer (~> 0.6.3)

    rubocop (1.50.2)

    rtlcss (0.2.1)

      mini_racer (>= 0.6.3)

    rubocop (1.55.1)

      json (~> 2.3)

      language_server-protocol (>= 3.17.0)

      parallel (~> 1.10)

      parser (>= 3.2.0.0)

      parser (>= 3.2.2.3)

      rainbow (>= 2.2.2, < 4.0)

      regexp_parser (>= 1.8, < 3.0)

      rexml (>= 3.2.5, < 4.0)

      rubocop-ast (>= 1.28.0, < 2.0)

      rubocop-ast (>= 1.28.1, < 2.0)

      ruby-progressbar (~> 1.7)

      unicode-display_width (>= 2.4.0, < 3.0)

    rubocop-ast (1.28.0)

    rubocop-ast (1.29.0)

      parser (>= 3.2.1.0)

    rubocop-capybara (2.17.1)

    rubocop-capybara (2.18.0)

      rubocop (~> 1.41)

    rubocop-discourse (3.2.0)

    rubocop-discourse (3.3.0)

      rubocop (>= 1.1.0)

      rubocop-rspec (>= 2.0.0)

    rubocop-rspec (2.19.0)

    rubocop-factory_bot (2.23.1)

      rubocop (~> 1.33)

    rubocop-rspec (2.23.0)

      rubocop (~> 1.33)

      rubocop-capybara (~> 2.17)

    ruby-prof (1.6.1)

      rubocop-factory_bot (~> 2.22)

    ruby-prof (1.6.3)

    ruby-progressbar (1.13.0)

    ruby-readability (0.7.0)

      guess_html_encoding (>= 0.0.4)

      nokogiri (>= 1.6.0)

    ruby2_keywords (0.0.5)

    rubyzip (2.3.2)

    sanitize (6.0.1)

    sanitize (6.0.2)

      crass (~> 1.0.2)

      nokogiri (>= 1.12.0)

    sass-embedded (1.62.0)

      google-protobuf (~> 3.21)

      rake (>= 10.0.0)

    selenium-webdriver (4.8.6)

    sass-embedded (1.64.1)

      google-protobuf (~> 3.23)

      rake (>= 13.0.0)

    selenium-webdriver (4.10.0)

      rexml (~> 3.2, >= 3.2.5)

      rubyzip (>= 1.2.2, < 3.0)

      websocket (~> 1.0)

    shoulda-matchers (5.3.0)

      activesupport (>= 5.2.0)

    sidekiq (6.5.8)

    sidekiq (6.5.9)

      connection_pool (>= 2.2.5, < 3)

      rack (~> 2.0)

      redis (>= 4.5.0, < 5)

      simplecov_json_formatter (~> 0.1)

    simplecov-html (0.12.3)

    simplecov_json_formatter (0.1.4)

    simpleidn (0.2.1)

      unf (~> 0.1.4)

    snaky_hash (2.0.1)

      hashie

      version_gem (~> 1.1, >= 1.1.1)

    syntax_tree (6.1.1)

      prettier_print (>= 1.2.0)

    syntax_tree-disable_ternary (1.0.0)

    test-prof (1.2.1)

    thor (1.2.1)

    tilt (2.1.0)

    timeout (0.3.2)

    test-prof (1.2.2)

    thor (1.2.2)

    tilt (2.2.0)

    timeout (0.4.0)

    tzinfo (2.0.6)

      concurrent-ruby (~> 1.0)

    tzinfo-data (1.2023.3)

      kgio (~> 2.6)

      raindrops (~> 0.7)

    uniform_notifier (1.16.0)

    uri (0.12.1)

    uri_template (0.7.0)

    version_gem (1.1.2)

    uri (0.12.2)

    version_gem (1.1.3)

    web-push (3.0.0)

      hkdf (~> 1.0)

      jwt (~> 2.0)

      openssl (~> 3.0)

    webdrivers (5.2.0)

    webdrivers (5.3.1)

      nokogiri (~> 1.6)

      rubyzip (>= 1.3.0)

      selenium-webdriver (~> 4.0)

      selenium-webdriver (~> 4.0, < 4.11)

    webmock (3.18.1)

      addressable (>= 2.8.0)

      crack (>= 0.3.2)

      hashdiff (>= 0.4.0, < 2.0.0)

    webrick (1.7.0)

    websocket (1.2.9)

    xpath (3.2.0)

      nokogiri (~> 1.8)

    yaml-lint (0.1.2)

    yard (0.9.34)

    zeitwerk (2.6.7)

    zeitwerk (2.6.10)

PLATFORMS

  ruby

DEPENDENCIES

  actionmailer (= 7.0.4.3)

  actionpack (= 7.0.4.3)

  actionview (= 7.0.4.3)

  actionmailer (= 7.0.5.1)

  actionpack (= 7.0.5.1)

  actionview (= 7.0.5.1)

  actionview_precompiler

  active_model_serializers (~> 0.8.3)

  activemodel (= 7.0.4.3)

  activerecord (= 7.0.4.3)

  activesupport (= 7.0.4.3)

  activemodel (= 7.0.5.1)

  activerecord (= 7.0.5.1)

  activesupport (= 7.0.5.1)

  addressable

  annotate

  aws-sdk-s3

  net-pop

  net-smtp

  nokogiri

  oj (= 3.13.14)

  oj

  omniauth

  omniauth-facebook

  omniauth-github

  rack

  rack-mini-profiler

  rack-protection

  rails-dom-testing

  rails_failover

  rails_multisite

  railties (= 7.0.4.3)

  railties (= 7.0.5.1)

  rake

  rb-fsevent

  rbtrace

  rubyzip

  sanitize

  selenium-webdriver

  shoulda-matchers

  shoulda-matchers!

  sidekiq

  simplecov

  sprockets!

  web-push

  webdrivers

  webmock

  webrick

  yaml-lint

  yard

BUNDLED WITH

   2.4.10

   2.4.13

diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile

index 77ced01..1e60ab0 100644

index 4ca11d4f82ea..c0450ad6f8f3 100644

--- a/ext/sass/Rakefile

+++ b/ext/sass/Rakefile

@@ -18,15 +18,7 @@ file 'protoc.exe' do |t|

 end

 file 'sass_embedded' do |t|

-  archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })

-  unarchive archive

-  rm archive

 file 'dart-sass' do |t|

-  raise if ENV.key?('DART_SASS')

-

-  if ENV.key?('NIX_BINTOOLS')

-    sh 'patchelf',

-       '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,

-       (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })

-  gem_install 'sass-embedded', SassConfig.gem_version, SassConfig.gem_platform do |dir|

-    cp_r File.absolute_path("ext/sass/#{t.name}", dir), t.name

-  end

+  symlink(ENV.fetch(t.name.upcase), 'sass_embedded')

-rescue StandardError

-  archive = fetch(ENV.fetch('DART_SASS') { SassConfig.default_dart_sass })

-  unarchive archive

-  rm archive

+  symlink(ENV.fetch('DART_SASS'), t.name)

 end

 file 'embedded.rb' => %w[sass_embedded] do |t|

 file 'cli.rb' => %w[dart-sass] do |t|