Skip to content

Commit febe119

Browse files
authored
Merge pull request #770 from lcreid/main
Preparing v5.5.0
2 parents 54bfcab + 1b637a2 commit febe119

File tree

6 files changed

+101
-106
lines changed

6 files changed

+101
-106
lines changed

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# yarn lockfile v1
33

44

5-
lastUpdateCheck 1761695563757
5+
lastUpdateCheck 1761786460258

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ https://github.com/bootstrap-ruby/bootstrap_form/releases
66

77
## Diffs
88

9+
- [5.5.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.4.0...v5.5.0)
10+
[Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2023-10-30T00A00..2025-10-30T00)
911
- [5.4.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.3.2...v5.4.0)
1012
[Closed issues](https://github.com/bootstrap-ruby/bootstrap_form/issues?q=closed%3A2023-09-15T21%3A00..2023-10-30T00)
1113
- [5.3.2](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.3.1...v5.3.2)
@@ -57,6 +59,7 @@ The tooling to support our old way of doing the change log doesn't work anymore,
5759
* [#573](https://github.com/bootstrap-ruby/bootstrap_form/issues/573): Add support for Bootstrap 5's floating labels
5860

5961
* [#215](https://github.com/bootstrap-ruby/bootstrap_form/issues/215): Add `include_hidden` option to `check_box`
62+
6063
### Bugfixes
6164

6265
* [#582](https://github.com/bootstrap-ruby/bootstrap_form/issues/582): Fix tests in bootstrap-5 branch, removes Rubocop offenses, and adds testing with Rails 6.1.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Some other nice things that `bootstrap_form` does for you are:
2626
`bootstrap_form` supports at a minimum the currently supported versions of Ruby and Rails:
2727

2828
* Ruby 3.2+ (https://www.ruby-lang.org/en/downloads/branches/)
29-
* Rails 7.1+ (https://guides.rubyonrails.org/maintenance_policy.html)
29+
* Rails 7.2+ (https://guides.rubyonrails.org/maintenance_policy.html)
3030
* Bootstrap 5.0+
3131

3232
## Installation
@@ -52,7 +52,7 @@ You can use this gem with other ways of installing Bootstrap, but how to do so i
5252
Once Bootstrap is installed, add the `bootstrap_form` gem to your `Gemfile`:
5353

5454
```ruby
55-
gem "bootstrap_form", "~> 5.4"
55+
gem "bootstrap_form", "~> 5.5"
5656
```
5757

5858
Then:
@@ -792,7 +792,7 @@ This generates:
792792
<label class="form-check-label" for="user_skill_level_2">Farming</label>
793793
</div>
794794
</div>
795-
<input autocomplete="off" id="user_skills" name="user[skills][]" type="hidden" value="">
795+
<input id="user_skills" name="user[skills][]" type="hidden" value="">
796796
<div class="mb-3">
797797
<label class="form-label" for="user_skills">Skills</label>
798798
<div class="form-check">
@@ -1505,7 +1505,7 @@ Generated HTML:
15051505
<div class="invalid-feedback">is invalid</div>
15061506
</div>
15071507
</div>
1508-
<input autocomplete="off" id="user_preferences" name="user[preferences][]" type="hidden" value="">
1508+
<input id="user_preferences" name="user[preferences][]" type="hidden" value="">
15091509
<div class="mb-3">
15101510
<label class="form-label" for="user_preferences">Preferences</label>
15111511
<div class="form-check">

RELEASING.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,15 @@ Follow these steps to release a new version of bootstrap_form to rubygems.org.
1414
2. Update the version in `./lib/bootstrap_form/version.rb`.
1515
3. Make sure that you have all the gems necessary for testing and releasing.
1616

17-
BUNDLE_GEMFILE=gemfiles/7.1.gemfile bundle update
17+
BUNDLE_GEMFILE=gemfiles/7.2.gemfile bundle update
1818

1919
4. **Ensure the tests are passing by running the tests**
2020

2121
(There should be no errors or warnings.)
2222

23-
BUNDLE_GEMFILE=gemfiles/7.1.gemfile bundle exec rake test
24-
25-
5. **Ensure the demo tests are passing by running**
26-
27-
cd demo
28-
bundle update
2923
bundle exec rake test:all
30-
cd -
3124

32-
(You will have failures unless you're running on a Mac configured so the screenshots will be identical. This is something that we're hoping to fix.)
25+
You will have failures in the system tests unless you're running on Linux. Chrome on each operating system renders slightly differently.
3326

3427
6. Update the GitHub diff links at the beginning of `CHANGELOG.md` (The pattern should be obvious when you look at them).
3528
7. Update the installation instructions in `README.md` to use the new version.

demo/Gemfile.lock

Lines changed: 89 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
PATH
22
remote: ..
33
specs:
4-
bootstrap_form (5.4.0)
5-
actionpack (>= 7.1)
6-
activemodel (>= 7.1)
4+
bootstrap_form (5.5.0)
5+
actionpack (>= 7.2)
6+
activemodel (>= 7.2)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
1111
action_text-trix (2.1.15)
1212
railties
13-
actioncable (8.1.0)
14-
actionpack (= 8.1.0)
15-
activesupport (= 8.1.0)
13+
actioncable (8.1.1)
14+
actionpack (= 8.1.1)
15+
activesupport (= 8.1.1)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (8.1.0)
20-
actionpack (= 8.1.0)
21-
activejob (= 8.1.0)
22-
activerecord (= 8.1.0)
23-
activestorage (= 8.1.0)
24-
activesupport (= 8.1.0)
19+
actionmailbox (8.1.1)
20+
actionpack (= 8.1.1)
21+
activejob (= 8.1.1)
22+
activerecord (= 8.1.1)
23+
activestorage (= 8.1.1)
24+
activesupport (= 8.1.1)
2525
mail (>= 2.8.0)
26-
actionmailer (8.1.0)
27-
actionpack (= 8.1.0)
28-
actionview (= 8.1.0)
29-
activejob (= 8.1.0)
30-
activesupport (= 8.1.0)
26+
actionmailer (8.1.1)
27+
actionpack (= 8.1.1)
28+
actionview (= 8.1.1)
29+
activejob (= 8.1.1)
30+
activesupport (= 8.1.1)
3131
mail (>= 2.8.0)
3232
rails-dom-testing (~> 2.2)
33-
actionpack (8.1.0)
34-
actionview (= 8.1.0)
35-
activesupport (= 8.1.0)
33+
actionpack (8.1.1)
34+
actionview (= 8.1.1)
35+
activesupport (= 8.1.1)
3636
nokogiri (>= 1.8.5)
3737
rack (>= 2.2.4)
3838
rack-session (>= 1.0.1)
3939
rack-test (>= 0.6.3)
4040
rails-dom-testing (~> 2.2)
4141
rails-html-sanitizer (~> 1.6)
4242
useragent (~> 0.16)
43-
actiontext (8.1.0)
43+
actiontext (8.1.1)
4444
action_text-trix (~> 2.1.15)
45-
actionpack (= 8.1.0)
46-
activerecord (= 8.1.0)
47-
activestorage (= 8.1.0)
48-
activesupport (= 8.1.0)
45+
actionpack (= 8.1.1)
46+
activerecord (= 8.1.1)
47+
activestorage (= 8.1.1)
48+
activesupport (= 8.1.1)
4949
globalid (>= 0.6.0)
5050
nokogiri (>= 1.8.5)
51-
actionview (8.1.0)
52-
activesupport (= 8.1.0)
51+
actionview (8.1.1)
52+
activesupport (= 8.1.1)
5353
builder (~> 3.1)
5454
erubi (~> 1.11)
5555
rails-dom-testing (~> 2.2)
5656
rails-html-sanitizer (~> 1.6)
57-
activejob (8.1.0)
58-
activesupport (= 8.1.0)
57+
activejob (8.1.1)
58+
activesupport (= 8.1.1)
5959
globalid (>= 0.3.6)
60-
activemodel (8.1.0)
61-
activesupport (= 8.1.0)
62-
activerecord (8.1.0)
63-
activemodel (= 8.1.0)
64-
activesupport (= 8.1.0)
60+
activemodel (8.1.1)
61+
activesupport (= 8.1.1)
62+
activerecord (8.1.1)
63+
activemodel (= 8.1.1)
64+
activesupport (= 8.1.1)
6565
timeout (>= 0.4.0)
66-
activestorage (8.1.0)
67-
actionpack (= 8.1.0)
68-
activejob (= 8.1.0)
69-
activerecord (= 8.1.0)
70-
activesupport (= 8.1.0)
66+
activestorage (8.1.1)
67+
actionpack (= 8.1.1)
68+
activejob (= 8.1.1)
69+
activerecord (= 8.1.1)
70+
activesupport (= 8.1.1)
7171
marcel (~> 1.0)
72-
activesupport (8.1.0)
72+
activesupport (8.1.1)
7373
base64
7474
bigdecimal
7575
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -87,9 +87,9 @@ GEM
8787
base64 (0.3.0)
8888
bigdecimal (3.3.1)
8989
bindex (0.8.1)
90-
bootsnap (1.18.4)
90+
bootsnap (1.18.6)
9191
msgpack (~> 1.2)
92-
brakeman (7.0.2)
92+
brakeman (7.1.0)
9393
racc
9494
builder (3.3.0)
9595
capybara (3.40.0)
@@ -101,7 +101,7 @@ GEM
101101
rack-test (>= 0.6.3)
102102
regexp_parser (>= 1.5, < 3.0)
103103
xpath (~> 3.2)
104-
capybara-screenshot-diff (1.10.2)
104+
capybara-screenshot-diff (1.10.3.1)
105105
actionpack (>= 7.0, < 9)
106106
capybara (>= 2, < 4)
107107
chunky_png (1.4.0)
@@ -110,12 +110,12 @@ GEM
110110
crass (1.0.6)
111111
cssbundling-rails (1.4.3)
112112
railties (>= 6.0.0)
113-
date (3.4.1)
114-
debug (1.10.0)
113+
date (3.5.0)
114+
debug (1.11.0)
115115
irb (~> 1.10)
116116
reline (>= 0.3.8)
117117
drb (2.2.3)
118-
erb (5.1.1)
118+
erb (5.1.3)
119119
erubi (1.13.1)
120120
globalid (1.3.0)
121121
activesupport (>= 6.1)
@@ -127,12 +127,12 @@ GEM
127127
pp (>= 0.6.0)
128128
rdoc (>= 4.0.0)
129129
reline (>= 0.4.2)
130-
jbuilder (2.13.0)
131-
actionview (>= 5.0.0)
132-
activesupport (>= 5.0.0)
130+
jbuilder (2.14.1)
131+
actionview (>= 7.0.0)
132+
activesupport (>= 7.0.0)
133133
jsbundling-rails (1.3.1)
134134
railties (>= 6.0.0)
135-
json (2.15.1)
135+
json (2.15.2)
136136
logger (1.7.0)
137137
loofah (2.24.1)
138138
crass (~> 1.0.2)
@@ -144,7 +144,7 @@ GEM
144144
net-pop
145145
net-smtp
146146
marcel (1.1.0)
147-
matrix (0.4.2)
147+
matrix (0.4.3)
148148
mini_mime (1.1.5)
149149
mini_portile2 (2.8.9)
150150
minitest (5.26.0)
@@ -175,16 +175,15 @@ GEM
175175
pp (0.6.3)
176176
prettyprint
177177
prettyprint (0.2.0)
178-
propshaft (1.1.0)
178+
propshaft (1.3.1)
179179
actionpack (>= 7.0.0)
180180
activesupport (>= 7.0.0)
181181
rack
182-
railties (>= 7.0.0)
183182
psych (5.2.6)
184183
date
185184
stringio
186-
public_suffix (6.0.1)
187-
puma (6.6.0)
185+
public_suffix (6.0.2)
186+
puma (7.1.0)
188187
nio4r (~> 2.0)
189188
racc (1.8.1)
190189
rack (3.2.3)
@@ -195,71 +194,71 @@ GEM
195194
rack (>= 1.3)
196195
rackup (2.2.1)
197196
rack (>= 3)
198-
rails (8.1.0)
199-
actioncable (= 8.1.0)
200-
actionmailbox (= 8.1.0)
201-
actionmailer (= 8.1.0)
202-
actionpack (= 8.1.0)
203-
actiontext (= 8.1.0)
204-
actionview (= 8.1.0)
205-
activejob (= 8.1.0)
206-
activemodel (= 8.1.0)
207-
activerecord (= 8.1.0)
208-
activestorage (= 8.1.0)
209-
activesupport (= 8.1.0)
197+
rails (8.1.1)
198+
actioncable (= 8.1.1)
199+
actionmailbox (= 8.1.1)
200+
actionmailer (= 8.1.1)
201+
actionpack (= 8.1.1)
202+
actiontext (= 8.1.1)
203+
actionview (= 8.1.1)
204+
activejob (= 8.1.1)
205+
activemodel (= 8.1.1)
206+
activerecord (= 8.1.1)
207+
activestorage (= 8.1.1)
208+
activesupport (= 8.1.1)
210209
bundler (>= 1.15.0)
211-
railties (= 8.1.0)
210+
railties (= 8.1.1)
212211
rails-dom-testing (2.3.0)
213212
activesupport (>= 5.0.0)
214213
minitest
215214
nokogiri (>= 1.6)
216215
rails-html-sanitizer (1.6.2)
217216
loofah (~> 2.21)
218217
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)
219-
railties (8.1.0)
220-
actionpack (= 8.1.0)
221-
activesupport (= 8.1.0)
218+
railties (8.1.1)
219+
actionpack (= 8.1.1)
220+
activesupport (= 8.1.1)
222221
irb (~> 1.13)
223222
rackup (>= 1.0.0)
224223
rake (>= 12.2)
225224
thor (~> 1.0, >= 1.2.2)
226225
tsort (>= 0.2)
227226
zeitwerk (~> 2.6)
228-
rake (13.3.0)
227+
rake (13.3.1)
229228
rdoc (6.15.0)
230229
erb
231230
psych (>= 4.0.0)
232231
tsort
233-
regexp_parser (2.10.0)
232+
regexp_parser (2.11.3)
234233
reline (0.6.2)
235234
io-console (~> 0.5)
236-
rexml (3.4.1)
237-
rubyzip (2.4.1)
235+
rexml (3.4.4)
236+
rubyzip (3.2.1)
238237
securerandom (0.4.1)
239-
selenium-webdriver (4.29.1)
238+
selenium-webdriver (4.38.0)
240239
base64 (~> 0.2)
241240
logger (~> 1.4)
242241
rexml (~> 3.2, >= 3.2.5)
243-
rubyzip (>= 1.2.2, < 3.0)
242+
rubyzip (>= 1.2.2, < 4.0)
244243
websocket (~> 1.0)
245-
sqlite3 (2.6.0-aarch64-linux-gnu)
246-
sqlite3 (2.6.0-arm-linux-gnu)
247-
sqlite3 (2.6.0-arm64-darwin)
248-
sqlite3 (2.6.0-x86-linux-gnu)
249-
sqlite3 (2.6.0-x86_64-darwin)
250-
sqlite3 (2.6.0-x86_64-linux-gnu)
244+
sqlite3 (2.7.4-aarch64-linux-gnu)
245+
sqlite3 (2.7.4-arm-linux-gnu)
246+
sqlite3 (2.7.4-arm64-darwin)
247+
sqlite3 (2.7.4-x86-linux-gnu)
248+
sqlite3 (2.7.4-x86_64-darwin)
249+
sqlite3 (2.7.4-x86_64-linux-gnu)
251250
stimulus-rails (1.3.4)
252251
railties (>= 6.0.0)
253252
stringio (3.1.7)
254253
thor (1.4.0)
255-
thruster (0.1.14)
256-
thruster (0.1.14-aarch64-linux)
257-
thruster (0.1.14-arm64-darwin)
258-
thruster (0.1.14-x86_64-darwin)
259-
thruster (0.1.14-x86_64-linux)
260-
timeout (0.4.3)
254+
thruster (0.1.16)
255+
thruster (0.1.16-aarch64-linux)
256+
thruster (0.1.16-arm64-darwin)
257+
thruster (0.1.16-x86_64-darwin)
258+
thruster (0.1.16-x86_64-linux)
259+
timeout (0.4.4)
261260
tsort (0.2.0)
262-
turbo-rails (2.0.16)
261+
turbo-rails (2.0.20)
263262
actionpack (>= 7.1.0)
264263
railties (>= 7.1.0)
265264
tzinfo (2.0.6)

lib/bootstrap_form/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module BootstrapForm
2-
VERSION = "5.4.0".freeze
3-
REQUIRED_RAILS_VERSION = ">= 7.1".freeze
2+
VERSION = "5.5.0".freeze
3+
REQUIRED_RAILS_VERSION = ">= 7.2".freeze
44
end

0 commit comments

Comments
 (0)