Skip to content

Commit 8321702

Browse files
rafaelfrancarafaelfranca
committed
Preparing for 6.1.4 release
1 parent e71539c commit 8321702

File tree

32 files changed

+127
-85
lines changed

32 files changed

+127
-85
lines changed

‎Gemfile.lock

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -30,83 +30,83 @@ GIT
3030
PATH
3131
remote: .
3232
specs:
33-
actioncable (6.1.3.2)
34-
actionpack (= 6.1.3.2)
35-
activesupport (= 6.1.3.2)
33+
actioncable (6.1.4)
34+
actionpack (= 6.1.4)
35+
activesupport (= 6.1.4)
3636
nio4r (~> 2.0)
3737
websocket-driver (>= 0.6.1)
38-
actionmailbox (6.1.3.2)
39-
actionpack (= 6.1.3.2)
40-
activejob (= 6.1.3.2)
41-
activerecord (= 6.1.3.2)
42-
activestorage (= 6.1.3.2)
43-
activesupport (= 6.1.3.2)
38+
actionmailbox (6.1.4)
39+
actionpack (= 6.1.4)
40+
activejob (= 6.1.4)
41+
activerecord (= 6.1.4)
42+
activestorage (= 6.1.4)
43+
activesupport (= 6.1.4)
4444
mail (>= 2.7.1)
45-
actionmailer (6.1.3.2)
46-
actionpack (= 6.1.3.2)
47-
actionview (= 6.1.3.2)
48-
activejob (= 6.1.3.2)
49-
activesupport (= 6.1.3.2)
45+
actionmailer (6.1.4)
46+
actionpack (= 6.1.4)
47+
actionview (= 6.1.4)
48+
activejob (= 6.1.4)
49+
activesupport (= 6.1.4)
5050
mail (~> 2.5, >= 2.5.4)
5151
rails-dom-testing (~> 2.0)
52-
actionpack (6.1.3.2)
53-
actionview (= 6.1.3.2)
54-
activesupport (= 6.1.3.2)
52+
actionpack (6.1.4)
53+
actionview (= 6.1.4)
54+
activesupport (= 6.1.4)
5555
rack (~> 2.0, >= 2.0.9)
5656
rack-test (>= 0.6.3)
5757
rails-dom-testing (~> 2.0)
5858
rails-html-sanitizer (~> 1.0, >= 1.2.0)
59-
actiontext (6.1.3.2)
60-
actionpack (= 6.1.3.2)
61-
activerecord (= 6.1.3.2)
62-
activestorage (= 6.1.3.2)
63-
activesupport (= 6.1.3.2)
59+
actiontext (6.1.4)
60+
actionpack (= 6.1.4)
61+
activerecord (= 6.1.4)
62+
activestorage (= 6.1.4)
63+
activesupport (= 6.1.4)
6464
nokogiri (>= 1.8.5)
65-
actionview (6.1.3.2)
66-
activesupport (= 6.1.3.2)
65+
actionview (6.1.4)
66+
activesupport (= 6.1.4)
6767
builder (~> 3.1)
6868
erubi (~> 1.4)
6969
rails-dom-testing (~> 2.0)
7070
rails-html-sanitizer (~> 1.1, >= 1.2.0)
71-
activejob (6.1.3.2)
72-
activesupport (= 6.1.3.2)
71+
activejob (6.1.4)
72+
activesupport (= 6.1.4)
7373
globalid (>= 0.3.6)
74-
activemodel (6.1.3.2)
75-
activesupport (= 6.1.3.2)
76-
activerecord (6.1.3.2)
77-
activemodel (= 6.1.3.2)
78-
activesupport (= 6.1.3.2)
79-
activestorage (6.1.3.2)
80-
actionpack (= 6.1.3.2)
81-
activejob (= 6.1.3.2)
82-
activerecord (= 6.1.3.2)
83-
activesupport (= 6.1.3.2)
74+
activemodel (6.1.4)
75+
activesupport (= 6.1.4)
76+
activerecord (6.1.4)
77+
activemodel (= 6.1.4)
78+
activesupport (= 6.1.4)
79+
activestorage (6.1.4)
80+
actionpack (= 6.1.4)
81+
activejob (= 6.1.4)
82+
activerecord (= 6.1.4)
83+
activesupport (= 6.1.4)
8484
marcel (~> 1.0.0)
8585
mini_mime (>= 1.1.0)
86-
activesupport (6.1.3.2)
86+
activesupport (6.1.4)
8787
concurrent-ruby (~> 1.0, >= 1.0.2)
8888
i18n (>= 1.6, < 2)
8989
minitest (>= 5.1)
9090
tzinfo (~> 2.0)
9191
zeitwerk (~> 2.3)
92-
rails (6.1.3.2)
93-
actioncable (= 6.1.3.2)
94-
actionmailbox (= 6.1.3.2)
95-
actionmailer (= 6.1.3.2)
96-
actionpack (= 6.1.3.2)
97-
actiontext (= 6.1.3.2)
98-
actionview (= 6.1.3.2)
99-
activejob (= 6.1.3.2)
100-
activemodel (= 6.1.3.2)
101-
activerecord (= 6.1.3.2)
102-
activestorage (= 6.1.3.2)
103-
activesupport (= 6.1.3.2)
92+
rails (6.1.4)
93+
actioncable (= 6.1.4)
94+
actionmailbox (= 6.1.4)
95+
actionmailer (= 6.1.4)
96+
actionpack (= 6.1.4)
97+
actiontext (= 6.1.4)
98+
actionview (= 6.1.4)
99+
activejob (= 6.1.4)
100+
activemodel (= 6.1.4)
101+
activerecord (= 6.1.4)
102+
activestorage (= 6.1.4)
103+
activesupport (= 6.1.4)
104104
bundler (>= 1.15.0)
105-
railties (= 6.1.3.2)
105+
railties (= 6.1.4)
106106
sprockets-rails (>= 2.0.0)
107-
railties (6.1.3.2)
108-
actionpack (= 6.1.3.2)
109-
activesupport (= 6.1.3.2)
107+
railties (6.1.4)
108+
actionpack (= 6.1.4)
109+
activesupport (= 6.1.4)
110110
method_source
111111
rake (>= 0.13)
112112
thor (~> 1.0)
@@ -303,7 +303,7 @@ GEM
303303
listen (3.5.1)
304304
rb-fsevent (~> 0.10, >= 0.10.3)
305305
rb-inotify (~> 0.9, >= 0.9.10)
306-
loofah (2.9.1)
306+
loofah (2.10.0)
307307
crass (~> 1.0.2)
308308
nokogiri (>= 1.5.9)
309309
mail (2.7.1)
@@ -313,6 +313,7 @@ GEM
313313
method_source (1.0.0)
314314
mini_magick (4.11.0)
315315
mini_mime (1.1.0)
316+
mini_portile2 (2.5.3)
316317
minitest (5.14.4)
317318
minitest-bisect (1.5.1)
318319
minitest-server (~> 1.0)
@@ -336,6 +337,9 @@ GEM
336337
net-http-persistent (4.0.1)
337338
connection_pool (~> 2.2)
338339
nio4r (2.5.7)
340+
nokogiri (1.11.3)
341+
mini_portile2 (~> 2.5.0)
342+
racc (~> 1.4)
339343
nokogiri (1.11.3-x86_64-darwin)
340344
racc (~> 1.4)
341345
os (1.1.1)

‎RAILS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.3.2
1+
6.1.4

‎actioncable/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* Fix `ArgumentError` with ruby 3.0 on `RemoteConnection#disconnect`.
24

35
*Vladislav*

‎actioncable/lib/action_cable/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actioncable/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rails/actioncable",
3-
"version": "6.1.3-2",
3+
"version": "6.1.4",
44
"description": "WebSocket framework for Ruby on Rails.",
55
"main": "app/assets/javascripts/action_cable.js",
66
"files": [

‎actionmailbox/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.3.2 (May 05, 2021) ##
27

38
* No changes.

‎actionmailbox/lib/action_mailbox/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actionmailer/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.3.2 (May 05, 2021) ##
27

38
* No changes.

‎actionmailer/lib/action_mailer/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actionpack/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* Ignore file fixtures on `db:fixtures:load`
24

35
*Kevin Sjöberg*

‎actionpack/lib/action_pack/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actiontext/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* Always render attachment partials as HTML with `:html` format inside trix editor.
24

35
*James Brooks*

‎actiontext/lib/action_text/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actiontext/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rails/actiontext",
3-
"version": "6.1.3-2",
3+
"version": "6.1.4",
44
"description": "Edit and display rich text in Rails applications",
55
"main": "app/javascript/actiontext/index.js",
66
"files": [

‎actionview/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* The `translate` helper now passes `default` values that aren't
24
translation keys through `I18n.translate` for interpolation.
35

‎actionview/lib/action_view/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎actionview/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rails/ujs",
3-
"version": "6.1.3-2",
3+
"version": "6.1.4",
44
"description": "Ruby on Rails unobtrusive scripting adapter",
55
"main": "lib/assets/compiled/rails-ujs.js",
66
"files": [

‎activejob/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.3.2 (May 05, 2021) ##
27

38
* No changes.

‎activejob/lib/active_job/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎activemodel/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* Fix `to_json` for `ActiveModel::Dirty` object.
24

35
Exclude +mutations_from_database+ attribute from json as it lead to recursion.

‎activemodel/lib/active_model/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎activerecord/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* Do not try to rollback transactions that failed due to a `ActiveRecord::TransactionRollbackError`.
24

35
*Jamie McCarthy*

‎activerecord/lib/active_record/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎activestorage/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* The parameters sent to `ffmpeg` for generating a video preview image are now
24
configurable under `config.active_storage.video_preview_arguments`.
35

‎activestorage/lib/active_storage/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

‎activestorage/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rails/activestorage",
3-
"version": "6.1.3-2",
3+
"version": "6.1.4",
44
"description": "Attach cloud and local files in Rails applications",
55
"main": "app/assets/javascripts/activestorage.js",
66
"files": [

‎activesupport/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Rails 6.1.4 (June 24, 2021) ##
2+
13
* MemCacheStore: convert any underlying value (including `false`) to an `Entry`.
24

35
See [#42559](https://github.com/rails/rails/pull/42559).

‎activesupport/lib/active_support/gem_version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.gem_version
99
module VERSION
1010
MAJOR = 6
1111
MINOR = 1
12-
TINY = 3
13-
PRE = "2"
12+
TINY = 4
13+
PRE = nil
1414

1515
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1616
end

0 commit comments

Comments
 (0)