diff --git a/Gemfile b/Gemfile index a4f570367..e7a164559 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'liquid' # Parse Markdown to HTML # ref: https://github.com/gjtorikian/commonmarker/issues/358 # can upgrade one this issue is fixed -gem 'commonmarker', '2.0.4' +gem 'commonmarker', '~> 0.23.11' # Validate Data against JSON Schema gem 'json_schemer' # Rack middleware for blocking & throttling abusive requests diff --git a/Gemfile.lock b/Gemfile.lock index ae3880447..6d165b56e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,8 +166,7 @@ GEM logger (~> 1.5) climate_control (1.2.0) coderay (1.1.3) - commonmarker (2.0.4) - rb_sys (~> 0.9) + commonmarker (0.23.11) concurrent-ruby (1.3.5) connection_pool (2.5.0) crack (1.0.0) @@ -666,12 +665,9 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rake-compiler-dock (1.9.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rb_sys (0.9.111) - rake-compiler-dock (= 1.9.1) rdoc (6.12.0) psych (>= 4.0.0) redis (5.4.0) @@ -943,7 +939,7 @@ DEPENDENCIES bundle-audit byebug climate_control - commonmarker (= 2.0.4) + commonmarker (~> 0.23.11) csv-safe database_cleaner ddtrace diff --git a/app/models/installation_config.rb b/app/models/installation_config.rb index f1603e4ca..cedabd073 100644 --- a/app/models/installation_config.rb +++ b/app/models/installation_config.rb @@ -19,7 +19,7 @@ class InstallationConfig < ApplicationRecord # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017 # FIX ME : fixes breakage of installation config. we need to migrate. # Fix configuration in application.rb - serialize :serialized_value, ActiveSupport::HashWithIndifferentAccess + serialize :serialized_value, coder: YAML, type: ActiveSupport::HashWithIndifferentAccess before_validation :set_lock validates :name, presence: true diff --git a/config/routes.rb b/config/routes.rb index 56704d9aa..a9b44f8ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -474,7 +474,9 @@ Rails.application.routes.draw do # ---------------------------------------------------------------------- # Internal Monitoring Routes require 'sidekiq/web' - require 'sidekiq/cron/web' + # FIXME: remove after https://github.com/sidekiq-cron/sidekiq-cron/pull/531/files is merged + # We need before we merge the PR + # require 'sidekiq/cron/web' devise_for :super_admins, path: 'super_admin', controllers: { sessions: 'super_admin/devise/sessions' } devise_scope :super_admin do diff --git a/package.json b/package.json index f1ab1c234..ab1a5ee66 100644 --- a/package.json +++ b/package.json @@ -137,8 +137,8 @@ "prosemirror-model": "^1.22.3", "size-limit": "^8.2.4", "tailwindcss": "^3.4.13", - "vite": "^5.4.12", - "vite-plugin-ruby": "^5.0.0", + "vite": "5.4.12", + "vite-plugin-ruby": "^5.1.1", "vitest": "3.0.5" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1696ded6d..5efa54c56 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -330,8 +330,8 @@ importers: specifier: 5.4.12 version: 5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0) vite-plugin-ruby: - specifier: ^5.0.0 - version: 5.0.0(vite@5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)) + specifier: ^5.1.1 + version: 5.1.1(vite@5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)) vitest: specifier: 3.0.5 version: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0) @@ -4796,8 +4796,8 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - vite-plugin-ruby@5.0.0: - resolution: {integrity: sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==} + vite-plugin-ruby@5.1.1: + resolution: {integrity: sha512-I1dXJq2ywdvTD2Cz5LYNcYLujqQ3eUxPoCjruRdfm2QBtHBY15NEeb6x5HuPM3T5S+y8S3p9fwRsieQQCjk0gg==} peerDependencies: vite: 5.4.12 @@ -10262,9 +10262,9 @@ snapshots: - supports-color - terser - vite-plugin-ruby@5.0.0(vite@5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)): + vite-plugin-ruby@5.1.1(vite@5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)): dependencies: - debug: 4.3.5 + debug: 4.4.0 fast-glob: 3.3.2 vite: 5.4.12(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0) transitivePeerDependencies: