aboutsummaryrefslogtreecommitdiffstats
path: root/actiontext
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-04-24 15:57:14 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-04-24 15:57:14 -0400
commit9834be65655e8552d25633b7376ab0654a23875d (patch)
treeadfdad1ab16fa484dc0448899b15c10fe76cd57b /actiontext
parent186458753f3614623523ad079d92c537cf03cb4a (diff)
downloadrails-9834be65655e8552d25633b7376ab0654a23875d.tar.gz
rails-9834be65655e8552d25633b7376ab0654a23875d.tar.bz2
rails-9834be65655e8552d25633b7376ab0654a23875d.zip
Start Rails 6.1 development
Diffstat (limited to 'actiontext')
-rw-r--r--actiontext/CHANGELOG.md14
-rw-r--r--actiontext/lib/action_text/gem_version.rb4
-rw-r--r--actiontext/package.json2
3 files changed, 4 insertions, 16 deletions
diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md
index b79ff612fb..b165f8b323 100644
--- a/actiontext/CHANGELOG.md
+++ b/actiontext/CHANGELOG.md
@@ -1,15 +1,3 @@
-## Rails 6.0.0.beta3 (March 11, 2019) ##
-* No changes.
-
-## Rails 6.0.0.beta2 (February 25, 2019) ##
-
-* No changes.
-
-
-## Rails 6.0.0.beta1 (January 18, 2019) ##
-
-* Added to Rails.
-
- *DHH*
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actiontext/CHANGELOG.md) for previous changes.
diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb
index ecd32d5f69..8b4103712c 100644
--- a/actiontext/lib/action_text/gem_version.rb
+++ b/actiontext/lib/action_text/gem_version.rb
@@ -8,9 +8,9 @@ module ActionText
module VERSION
MAJOR = 6
- MINOR = 0
+ MINOR = 1
TINY = 0
- PRE = "beta3"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/actiontext/package.json b/actiontext/package.json
index f67fea1642..594cfe16eb 100644
--- a/actiontext/package.json
+++ b/actiontext/package.json
@@ -1,6 +1,6 @@
{
"name": "@rails/actiontext",
- "version": "6.0.0-beta3",
+ "version": "6.1.0-alpha",
"description": "Edit and display rich text in Rails applications",
"main": "app/javascript/actiontext/index.js",
"files": [