diff --git a/Gemfile b/Gemfile index d732ce4ab1..7cca02762b 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem "lookbook", "~> 2.3.12" if ENV["VIEW_COMPONENT_PATH"] gem "view_component", path: ENV["VIEW_COMPONENT_PATH"] else - gem "view_component", "4.0.1" + gem "view_component", "4.0.2" end gem "kramdown", "~> 2.5" diff --git a/Gemfile.lock b/Gemfile.lock index 369eaf468c..b0fce7f9af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM unicode-emoji (4.1.0) uri (1.0.3) useragent (0.16.11) - view_component (4.0.1) + view_component (4.0.2) activesupport (>= 7.1.0, < 8.1) concurrent-ruby (~> 1) vite_rails (3.0.19) @@ -351,7 +351,7 @@ DEPENDENCIES sprockets-rails thor timecop - view_component (= 4.0.1) + view_component (= 4.0.2) vite_rails (~> 3.0) webmock yard (~> 0.9.37) diff --git a/app/controllers/primer/view_components/auto_check_controller.rb b/app/controllers/primer/view_components/auto_check_controller.rb index 5587931bfe..2a5f433062 100644 --- a/app/controllers/primer/view_components/auto_check_controller.rb +++ b/app/controllers/primer/view_components/auto_check_controller.rb @@ -8,7 +8,7 @@ class AutoCheckController < ApplicationController def error render partial: "primer/view_components/auto_check/error_message", locals: { input_value: params[:value] }, - status: :unprocessable_entity, + status: :unprocessable_content, formats: :html end @@ -33,7 +33,7 @@ def random status: :ok, formats: :html else - render status: :unprocessable_entity, plain: "Random error!" + render status: :unprocessable_content, plain: "Random error!" end end end diff --git a/app/controllers/primer/view_components/toggle_switch_controller.rb b/app/controllers/primer/view_components/toggle_switch_controller.rb index 41ae0db388..440b5fd6b7 100644 --- a/app/controllers/primer/view_components/toggle_switch_controller.rb +++ b/app/controllers/primer/view_components/toggle_switch_controller.rb @@ -37,7 +37,7 @@ def handle_invalid_authenticity_token def reject_non_ajax_request return if request.headers["HTTP_REQUESTED_WITH"] == "XMLHttpRequest" - head :unprocessable_entity + head :unprocessable_content end def form_params diff --git a/demo/Gemfile b/demo/Gemfile index e6961a98a6..7e0af02dc8 100644 --- a/demo/Gemfile +++ b/demo/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -rails_version = (ENV["RAILS_VERSION"] || "7.2.2.1").to_s +rails_version = (ENV["RAILS_VERSION"] || "7.2.2.2").to_s gem "rake", "~> 13.3" gem "rack-cors" @@ -37,7 +37,7 @@ gem "puma", "~> 6.6.1" gem "bootsnap", ">= 1.4.2", require: false gem "openproject-primer_view_components", path: "../" -gem "view_component", "4.0.2" +gem "view_component", "~> 4.0.2" gem "lookbook", "~> 2.3.13" unless rails_version.to_f < 7 gem "vite_rails", "~> 3.0" diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock index e31f01c68f..993b8a73fe 100644 --- a/demo/Gemfile.lock +++ b/demo/Gemfile.lock @@ -10,15 +10,15 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + actioncable (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionpack (7.2.2.1) - actionview (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionpack (7.2.2.2) + actionview (= 7.2.2.2) + activesupport (= 7.2.2.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -27,15 +27,15 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.2.1) - activesupport (= 7.2.2.1) + actionview (7.2.2.2) + activesupport (= 7.2.2.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.2.2.1) - activesupport (= 7.2.2.1) - activesupport (7.2.2.1) + activemodel (7.2.2.2) + activesupport (= 7.2.2.2) + activesupport (7.2.2.2) base64 benchmark (>= 0.3) bigdecimal @@ -71,8 +71,8 @@ GEM docker-remote (0.8.0) domain_name (0.6.20240107) drb (2.2.3) - dry-cli (1.2.0) - dry-inflector (0.3.0) + dry-cli (1.3.0) + dry-inflector (1.2.0) ejson (1.5.3) erb (5.0.2) erubi (1.13.1) @@ -92,19 +92,19 @@ GEM faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -112,14 +112,15 @@ GEM thor (~> 1.4) gli (2.22.2) ostruct - google-cloud-env (2.2.1) + google-cloud-env (2.3.1) + base64 (~> 0.2) faraday (>= 1.0, < 3.a) - google-logging-utils (0.1.0) - googleauth (1.13.1) + google-logging-utils (0.2.0) + googleauth (1.15.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.2) google-logging-utils (~> 0.1) - jwt (>= 1.4, < 3.0) + jwt (>= 1.4, < 4.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -134,9 +135,8 @@ GEM railties (>= 7.0.0) htmlbeautifier (1.4.3) htmlentities (4.3.4) - http (5.2.0) + http (5.3.1) addressable (~> 2.8) - base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) @@ -153,7 +153,7 @@ GEM reline (>= 0.4.2) jsonpath (1.1.5) multi_json - jwt (2.10.1) + jwt (3.1.2) base64 kind-rb (0.1.0-arm64-darwin) kind-rb (0.1.0-x86_64-darwin) @@ -169,8 +169,8 @@ GEM oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kube-dsl (0.8.0) - dry-inflector (~> 0.2) + kube-dsl (0.8.3) + dry-inflector (>= 0.2.1, < 2) kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) @@ -207,7 +207,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.5.0) + llhttp-ffi (0.5.1) ffi-compiler (~> 1.0) rake (~> 13.0) logger (1.7.0) @@ -228,10 +228,10 @@ GEM zeitwerk (~> 2.5) marcel (1.0.4) method_source (1.1.0) - mime-types (3.6.0) + mime-types (3.7.0) logger - mime-types-data (~> 3.2015) - mime-types-data (3.2025.0304) + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2025.0826) minitest (5.25.5) ms_rest (0.7.6) concurrent-ruby (~> 1.0) @@ -243,8 +243,9 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) msgpack (1.8.0) - multi_json (1.15.0) + multi_json (1.17.0) multipart-post (2.4.1) + mutex_m (0.3.0) netrc (0.11.0) nio4r (2.7.4) nokogiri (1.18.9-arm64-darwin) @@ -253,12 +254,12 @@ GEM racc (~> 1.4) nokogiri (1.18.9-x86_64-linux-gnu) racc (~> 1.4) - oj (3.16.10) + oj (3.16.11) bigdecimal (>= 3.0) ostruct (>= 0.2) openproject-octicons (19.29.0) os (1.1.4) - ostruct (0.6.1) + ostruct (0.6.3) pp (0.6.2) prettyprint prettyprint (0.2.0) @@ -292,12 +293,12 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -323,10 +324,10 @@ GEM rouge (3.30.0) ruby2_keywords (0.0.5) securerandom (0.4.1) - signet (0.19.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) spring (4.4.0) spring-watcher-listen (2.1.0) @@ -340,7 +341,7 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - statsd-instrument (3.9.9) + statsd-instrument (3.9.10) stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.7) @@ -358,9 +359,10 @@ GEM vite_rails (3.0.19) railties (>= 5.1, < 9) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.9.0) + vite_ruby (3.9.2) dry-cli (>= 0.7, < 2) logger (~> 1.6) + mutex_m rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) websocket-driver (0.8.0) @@ -382,10 +384,10 @@ PLATFORMS x86_64-linux DEPENDENCIES - actioncable (= 7.2.2.1) - actionview (= 7.2.2.1) - activemodel (= 7.2.2.1) - activesupport (= 7.2.2.1) + actioncable (= 7.2.2.2) + actionview (= 7.2.2.2) + activemodel (= 7.2.2.2) + activesupport (= 7.2.2.2) bootsnap (>= 1.4.2) cssbundling-rails (~> 1.4) foreman @@ -400,7 +402,7 @@ DEPENDENCIES pry-byebug puma (~> 6.6.1) rack-cors - railties (= 7.2.2.1) + railties (= 7.2.2.2) rake (~> 13.3) spring (~> 4.4) spring-watcher-listen (~> 2.1) @@ -408,7 +410,7 @@ DEPENDENCIES sprockets-rails stimulus-rails turbo-rails - view_component (= 4.0.2) + view_component (~> 4.0.2) vite_rails (~> 3.0) BUNDLED WITH