Skip to content

Commit f05ac78

Browse files
committed
Merge branch '6-1-sec' into 6-1-stable
* 6-1-sec: Preparing for 6.1.6.1 release updating version and changelog Change ActiveRecord::Coders::YAMLColumn default to safe_load Preparing for 6.1.6 release
2 parents d571efb + dc1242f commit f05ac78

File tree

50 files changed

+938
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+938
-524
lines changed

RAILS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.6
1+
6.1.6.1

actioncable/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.1.6.1 (July 12, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.6 (May 09, 2022) ##
27

38
* No changes.

actioncable/lib/action_cable/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 6
1111
MINOR = 1
1212
TINY = 6
13-
PRE = nil
13+
PRE = "1"
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.6",
3+
"version": "6.1.6-1",
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.6.1 (July 12, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.6 (May 09, 2022) ##
27

38
* No changes.

actionmailbox/lib/action_mailbox/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 6
1111
MINOR = 1
1212
TINY = 6
13-
PRE = nil
13+
PRE = "1"
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.6.1 (July 12, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.6 (May 09, 2022) ##
27

38
* No changes.

actionmailer/lib/action_mailer/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 6
1111
MINOR = 1
1212
TINY = 6
13-
PRE = nil
13+
PRE = "1"
1414

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

actionpack/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 6.1.6.1 (July 12, 2022) ##
2+
3+
* No changes.
4+
5+
16
## Rails 6.1.6 (May 09, 2022) ##
27

38
* No changes.

actionpack/lib/action_pack/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module VERSION
1010
MAJOR = 6
1111
MINOR = 1
1212
TINY = 6
13-
PRE = nil
13+
PRE = "1"
1414

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

0 commit comments

Comments
 (0)