Skip to content

Commit d9aade6

Browse files
committed
Use a compatible version of chosen-rails
1 parent 2ce7c60 commit d9aade6

File tree

3 files changed

+44
-20
lines changed

3 files changed

+44
-20
lines changed

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ gem 'rails', '~> 8.0.4' # LOCKED: It is Rails.
55
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
66
gem 'sprockets-rails'
77

8-
gem "amazing_print" # colourful output (suggested by rails_semantic_logger)
9-
gem "rails_semantic_logger" # condense log lines: https://github.com/codebar/planner/issues/2339
8+
gem 'amazing_print' # colourful output (suggested by rails_semantic_logger)
9+
gem 'rails_semantic_logger' # condense log lines: https://github.com/codebar/planner/issues/2339
1010

1111
gem 'acts-as-taggable-on'
1212
gem 'benchmark' # LOCKED: Added because of activesupport 7.0
@@ -52,7 +52,7 @@ gem 'pagy'
5252
gem 'icalendar'
5353
gem 'tzinfo-data'
5454

55-
gem 'chosen-rails'
55+
gem 'chosen-rails', github: 'bearandgiraffe/chosen-rails', branch: 'support-rails-8'
5656
gem 'commonmarker'
5757

5858
gem 'faraday'
@@ -123,4 +123,4 @@ gem 'rollbar'
123123
gem 'scout_apm'
124124

125125
gem 'carrierwave-aws', '~> 1.6'
126-
gem "sitemap_generator", github: "kjvarga/sitemap_generator", branch: "master" # LOCKED: When a version higher than 6.3.0 is released, drop this LOCKED.
126+
gem 'sitemap_generator', github: 'kjvarga/sitemap_generator', branch: 'master' # LOCKED: When a version higher than 6.3.0 is released, drop this LOCKED.

Gemfile.lock

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/bearandgiraffe/chosen-rails.git
3+
revision: cfef31cb30ed6d0dfd65cae0ff6f4a2943812df0
4+
branch: support-rails-8
5+
specs:
6+
chosen-rails (2.0.0)
7+
coffee-rails (>= 3.2)
8+
dartsass-rails (>= 0.5.0)
9+
railties (>= 3.0)
10+
111
GIT
212
remote: https://github.com/kjvarga/sitemap_generator.git
313
revision: 63bf0ca495220ec7d65380b9609d8c21c24470a8
@@ -143,10 +153,6 @@ GEM
143153
carrierwave (>= 2.0, < 4)
144154
childprocess (5.1.0)
145155
logger (~> 1.5)
146-
chosen-rails (1.10.0)
147-
coffee-rails (>= 3.2)
148-
railties (>= 3.0)
149-
sassc-rails (>= 2.1.2)
150156
cocoon (1.2.15)
151157
coderay (1.1.3)
152158
coffee-rails (5.0.0)
@@ -156,17 +162,19 @@ GEM
156162
coffee-script-source
157163
execjs
158164
coffee-script-source (1.12.2)
159-
commonmarker (2.4.1)
160-
rb_sys (~> 0.9)
161-
commonmarker (2.4.1-aarch64-linux)
162-
commonmarker (2.4.1-x86_64-darwin)
163-
commonmarker (2.4.1-x86_64-linux)
165+
commonmarker (2.6.0-aarch64-linux)
166+
commonmarker (2.6.0-arm64-darwin)
167+
commonmarker (2.6.0-x86_64-darwin)
168+
commonmarker (2.6.0-x86_64-linux)
164169
concurrent-ruby (1.3.5)
165170
connection_pool (2.5.4)
166171
crass (1.0.6)
167172
css_parser (1.14.0)
168173
addressable
169174
csv (3.3.5)
175+
dartsass-rails (0.5.1)
176+
railties (>= 6.0.0)
177+
sass-embedded (~> 1.63)
170178
database_cleaner (2.1.0)
171179
database_cleaner-active_record (>= 2, < 3)
172180
database_cleaner-active_record (2.2.2)
@@ -212,6 +220,18 @@ GEM
212220
activerecord (>= 4.0.0)
213221
globalid (1.2.1)
214222
activesupport (>= 6.1)
223+
google-protobuf (4.33.2-aarch64-linux-gnu)
224+
bigdecimal
225+
rake (>= 13)
226+
google-protobuf (4.33.2-arm64-darwin)
227+
bigdecimal
228+
rake (>= 13)
229+
google-protobuf (4.33.2-x86_64-darwin)
230+
bigdecimal
231+
rake (>= 13)
232+
google-protobuf (4.33.2-x86_64-linux-gnu)
233+
bigdecimal
234+
rake (>= 13)
215235
haml (6.3.0)
216236
temple (>= 0.8.2)
217237
thor
@@ -429,12 +449,9 @@ GEM
429449
zeitwerk (~> 2.6)
430450
rainbow (3.1.1)
431451
rake (13.3.0)
432-
rake-compiler-dock (1.9.1)
433452
rb-fsevent (0.11.2)
434453
rb-inotify (0.10.1)
435454
ffi (~> 1.0)
436-
rb_sys (0.9.117)
437-
rake-compiler-dock (= 1.9.1)
438455
rdoc (6.15.0)
439456
erb
440457
psych (>= 4.0.0)
@@ -497,6 +514,14 @@ GEM
497514
ffi (~> 1.12)
498515
logger
499516
rubyzip (3.1.1)
517+
sass-embedded (1.97.0-aarch64-linux-gnu)
518+
google-protobuf (~> 4.31)
519+
sass-embedded (1.97.0-arm64-darwin)
520+
google-protobuf (~> 4.31)
521+
sass-embedded (1.97.0-x86_64-darwin)
522+
google-protobuf (~> 4.31)
523+
sass-embedded (1.97.0-x86_64-linux-gnu)
524+
google-protobuf (~> 4.31)
500525
sassc (2.4.0)
501526
ffi (~> 1.9)
502527
sassc-rails (2.1.2)
@@ -603,7 +628,7 @@ DEPENDENCIES
603628
capybara
604629
carrierwave
605630
carrierwave-aws (~> 1.6)
606-
chosen-rails
631+
chosen-rails!
607632
cocoon
608633
commonmarker
609634
csv

db/schema.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[7.1].define(version: 2025_08_23_151717) do
13+
ActiveRecord::Schema[8.0].define(version: 2025_08_23_151717) do
1414
# These are extensions that must be enabled in order to support this database
15-
enable_extension "plpgsql"
15+
enable_extension "pg_catalog.plpgsql"
1616

1717
# Custom types defined in this database.
1818
# Note that some types may not work with other database engines. Be careful if changing database.
@@ -567,5 +567,4 @@
567567
t.string "slack_channel_link"
568568
t.index ["chapter_id"], name: "index_workshops_on_chapter_id"
569569
end
570-
571570
end

0 commit comments

Comments
 (0)