aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage
diff options
context:
space:
mode:
Diffstat (limited to 'activestorage')
-rw-r--r--activestorage/CHANGELOG.md34
-rw-r--r--activestorage/lib/active_storage/gem_version.rb6
-rw-r--r--activestorage/package.json2
3 files changed, 5 insertions, 37 deletions
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
index 061898d143..6354ab9924 100644
--- a/activestorage/CHANGELOG.md
+++ b/activestorage/CHANGELOG.md
@@ -1,35 +1,3 @@
-* Preserve display aspect ratio when extracting width and height from videos
- with rectangular samples in `ActiveStorage::Analyzer::VideoAnalyzer`.
- When a video contains a display aspect ratio, emit it in metadata as
- `:display_aspect_ratio` rather than the ambiguous `:aspect_ratio`. Compute
- its height by scaling its encoded frame width according to the DAR.
- *George Claghorn*
-
-* Use `after_destroy_commit` instead of `before_destroy` for purging
- attachments when a record is destroyed.
-
- *Hiroki Zenigami*
-
-
-* Force `:attachment` disposition for specific, configurable content types.
- This mitigates possible security issues such as XSS or phishing when
- serving them inline. A list of such content types is included by default,
- and can be configured via `content_types_to_serve_as_binary`.
-
- *Rosa Gutierrez*
-
-
-## Rails 5.2.0.beta2 (November 28, 2017) ##
-
-* Fix the gem adding the migrations files to the package.
-
- *Yuji Yaginuma*
-
-
-## Rails 5.2.0.beta1 (November 27, 2017) ##
-
-* Added to Rails.
-
- *DHH*
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activestorage/CHANGELOG.md) for previous changes.
diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb
index f048bb0b77..492620731b 100644
--- a/activestorage/lib/active_storage/gem_version.rb
+++ b/activestorage/lib/active_storage/gem_version.rb
@@ -7,10 +7,10 @@ module ActiveStorage
end
module VERSION
- MAJOR = 5
- MINOR = 2
+ MAJOR = 6
+ MINOR = 0
TINY = 0
- PRE = "beta2"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff --git a/activestorage/package.json b/activestorage/package.json
index 621706000b..ec77dc391d 100644
--- a/activestorage/package.json
+++ b/activestorage/package.json
@@ -1,6 +1,6 @@
{
"name": "activestorage",
- "version": "5.2.0-beta2",
+ "version": "6.0.0-alpha",
"description": "Attach cloud and local files in Rails applications",
"main": "app/assets/javascripts/activestorage.js",
"files": [