Commit 5b88cfc5 authored by Matho's avatar Matho
Browse files

Introduce support for Rails 6 and Refinery > 4

parent f8f1a034
Pipeline #26220 failed with stages
in 0 seconds
## 0.4.0 [unreleased]
* Prepare gem for Rails 6 and Refinery CMS > 4
## 0.3.0 [1 November 2019] ## 0.3.0 [1 November 2019]
* Fix mini_magick version to >= 4.9.4, due to CVE-2019-13574 vulnerability * Fix mini_magick version to >= 4.9.4, due to CVE-2019-13574 vulnerability
* Change rack version to >= 1.6.11 due to CVE-2018-16471 vulnerability * Change rack version to >= 1.6.11 due to CVE-2018-16471 vulnerability
......
...@@ -5,14 +5,15 @@ gem "refinerycms-authentication-devise", '~> 2.0.1', git: 'https://github.com/r ...@@ -5,14 +5,15 @@ gem "refinerycms-authentication-devise", '~> 2.0.1', git: 'https://github.com/r
gemspec gemspec
gem 'refinerycms', '~> 4.0.3' gem 'refinerycms', '~> 4.1.0', git: 'https://github.com/refinery/refinerycms.git', branch: 'master'
gem 'actionmailer', '~> 6.0.0'
group :development, :test do group :development, :test do
gem 'listen' gem 'listen'
end end
group :development, :test do group :development, :test do
gem 'refinerycms-testing', '~> 4.0.3' # gem 'refinerycms-testing', '~> 4.0.3'
end end
# Add the default visual editor, for now. # Add the default visual editor, for now.
......
...@@ -9,61 +9,98 @@ GIT ...@@ -9,61 +9,98 @@ GIT
friendly_id (~> 5.2.1) friendly_id (~> 5.2.1)
refinerycms-core (>= 3.0.0, < 5.0) refinerycms-core (>= 3.0.0, < 5.0)
GIT
remote: https://github.com/refinery/refinerycms.git
revision: edeba87f56a09e66b3c7244875873bd2cceeae2d
branch: master
specs:
refinerycms (4.1.0)
refinerycms-core (= 4.1.0)
refinerycms-images (= 4.1.0)
refinerycms-pages (= 4.1.0)
refinerycms-resources (= 4.1.0)
refinerycms-core (4.1.0)
actionpack (>= 6.0.0, < 7)
activerecord (>= 6.0.0, < 7)
coffee-rails (~> 4.0, >= 4.0.0)
decorators (~> 2.0, >= 2.0.0)
font-awesome-sass (>= 4.3.0, < 5.0)
jquery-rails (~> 4.3, >= 4.3.1)
jquery-ui-rails (~> 6.0, >= 6.0.0)
railties (>= 6.0.0, < 7)
refinerycms-i18n (~> 5.0, >= 5.0.1)
sass-rails (>= 4.0, < 7)
truncate_html (~> 0.9)
will_paginate (~> 3.1, >= 3.1.0)
zilch-authorisation (~> 0, >= 0.0.1)
refinerycms-dragonfly (1.0.1)
dragonfly (~> 1.1)
refinerycms-core (~> 4.0, >= 4.0.2)
refinerycms-images (4.1.0)
refinerycms-core (= 4.1.0)
refinerycms-dragonfly (~> 1.0)
refinerycms-pages (4.1.0)
awesome_nested_set (~> 3.1, >= 3.1.0)
babosa (~> 1.0)
diffy (~> 3.1, >= 3.1.0)
friendly_id (>= 5.1.0, < 5.3)
friendly_id-mobility (~> 0.5)
refinerycms-core (= 4.1.0)
seo_meta (~> 3.0, >= 3.0.0)
speakingurl-rails (~> 8.0, >= 8.0.0)
refinerycms-resources (4.1.0)
refinerycms-core (= 4.1.0)
refinerycms-dragonfly (~> 1.0)
PATH PATH
remote: . remote: .
specs: specs:
refinerycms-photo-gallery (0.3.0) refinerycms-photo-gallery (0.4.0)
carrierwave (~> 1.3.1) carrierwave (~> 1.3.1)
mime-types mime-types
mini_exiftool mini_exiftool
mini_magick (>= 4.9.4) mini_magick (>= 4.9.4)
rack (>= 1.6.11) rack (>= 1.6.11)
refinerycms-core (~> 4.0.3) refinerycms-core (~> 4.1.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (5.1.7) actionmailer (6.0.1)
actionpack (= 5.1.7) actionpack (= 6.0.1)
actionview (= 5.1.7) actionview (= 6.0.1)
activejob (= 5.1.7) activejob (= 6.0.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.7) actionpack (6.0.1)
actionview (= 5.1.7) actionview (= 6.0.1)
activesupport (= 5.1.7) activesupport (= 6.0.1)
rack (~> 2.0) rack (~> 2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (5.1.7) actionview (6.0.1)
activesupport (= 5.1.7) activesupport (= 6.0.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (5.1.7) activejob (6.0.1)
activesupport (= 5.1.7) activesupport (= 6.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.7) activemodel (6.0.1)
activesupport (= 5.1.7) activesupport (= 6.0.1)
activemodel-serializers-xml (1.0.2) activerecord (6.0.1)
activemodel (> 5.x) activemodel (= 6.0.1)
activesupport (> 5.x) activesupport (= 6.0.1)
builder (~> 3.1) activesupport (6.0.1)
activerecord (5.1.7)
activemodel (= 5.1.7)
activesupport (= 5.1.7)
arel (~> 8.0)
activesupport (5.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts_as_indexed (0.8.3) zeitwerk (~> 2.2)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
awesome_nested_set (3.2.0) awesome_nested_set (3.2.0)
activerecord (>= 4.0.0, < 7.0) activerecord (>= 4.0.0, < 7.0)
babosa (1.0.3) babosa (1.0.3)
...@@ -94,7 +131,6 @@ GEM ...@@ -94,7 +131,6 @@ GEM
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.5)
crass (1.0.5) crass (1.0.5)
database_cleaner (1.7.0)
decorators (2.0.5) decorators (2.0.5)
railties (>= 4.0.0, < 7) railties (>= 4.0.0, < 7)
devise (4.7.1) devise (4.7.1)
...@@ -103,59 +139,30 @@ GEM ...@@ -103,59 +139,30 @@ GEM
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
diff-lcs (1.3)
diffy (3.3.0) diffy (3.3.0)
dragonfly (1.2.0) dragonfly (1.2.0)
addressable (~> 2.3) addressable (~> 2.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (>= 1.3) rack (>= 1.3)
dragonfly-s3_data_store (1.3.0)
dragonfly (~> 1.0)
fog-aws
erubi (1.9.0) erubi (1.9.0)
excon (0.68.0)
execjs (2.7.0) execjs (2.7.0)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
ffi (1.11.1) ffi (1.11.1)
fog-aws (3.5.2)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (2.1.2)
builder
excon (~> 0.58)
formatador (~> 0.2)
mime-types
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-sass (4.7.0) font-awesome-sass (4.7.0)
sass (>= 3.2) sass (>= 3.2)
formatador (0.2.5)
friendly_id (5.2.5) friendly_id (5.2.5)
activerecord (>= 4.0.0) activerecord (>= 4.0.0)
friendly_id-mobility (0.5.4)
friendly_id (>= 5.0.0, <= 5.3.0)
mobility (>= 0.5.1, < 1.0)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
globalize (5.1.0) i18n (1.7.0)
activemodel (>= 4.2, < 5.2)
activerecord (>= 4.2, < 5.2)
request_store (~> 1.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ipaddress (0.8.3)
jquery-rails (4.3.5) jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
...@@ -176,6 +183,9 @@ GEM ...@@ -176,6 +183,9 @@ GEM
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.13.0) minitest (5.13.0)
mobility (0.8.9)
i18n (>= 0.6.10, < 2)
request_store (~> 1.0)
multi_json (1.14.1) multi_json (1.14.1)
nokogiri (1.10.5) nokogiri (1.10.5)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
...@@ -193,83 +203,28 @@ GEM ...@@ -193,83 +203,28 @@ GEM
rack (2.0.7) rack (2.0.7)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails-controller-testing (0.1.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
rails-i18n (5.0.4) rails-i18n (6.0.0)
i18n (~> 0.7) i18n (>= 0.7, < 2)
railties (~> 5.0) railties (>= 6.0.0, < 7)
railties (5.1.7) railties (6.0.1)
actionpack (= 5.1.7) actionpack (= 6.0.1)
activesupport (= 5.1.7) activesupport (= 6.0.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.20.3, < 2.0)
rake (13.0.0) rake (13.0.0)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.0)
ffi (~> 1.0) ffi (~> 1.0)
refinerycms (4.0.3) refinerycms-i18n (5.0.1)
refinerycms-core (= 4.0.3) mobility (~> 0.8.8)
refinerycms-images (= 4.0.3) rails-i18n (>= 5.0)
refinerycms-pages (= 4.0.3) routing-filter (~> 0.4)
refinerycms-resources (= 4.0.3)
refinerycms-core (4.0.3)
actionpack (>= 5.1.0, < 5.2)
activerecord (>= 5.1.0, < 5.2)
awesome_nested_set (~> 3.0, >= 3.0.0)
coffee-rails (~> 4.0, >= 4.0.0)
decorators (~> 2.0, >= 2.0.0)
font-awesome-sass (>= 4.3.0, < 5.0)
jquery-rails (~> 4.3, >= 4.3.1)
jquery-ui-rails (~> 5.0, >= 5.0.0)
railties (>= 5.1.0, < 5.2)
refinerycms-i18n (~> 4.0, >= 4.0.0)
sass-rails (>= 4.0, < 5.1)
truncate_html (~> 0.9)
will_paginate (~> 3.1, >= 3.1.0)
zilch-authorisation (~> 0, >= 0.0.1)
refinerycms-dragonfly (1.0.1)
dragonfly (~> 1.1)
dragonfly-s3_data_store
refinerycms-i18n (4.0.2)
rails-i18n (~> 5.0.0)
routing-filter (>= 0.4.0)
refinerycms-images (4.0.3)
activemodel-serializers-xml (~> 1.0, >= 1.0.1)
globalize (>= 5.1.0.beta1, < 5.2)
refinerycms-core (= 4.0.3)
refinerycms-dragonfly (~> 1.0)
refinerycms-pages (4.0.3)
activemodel-serializers-xml (~> 1.0, >= 1.0.1)
awesome_nested_set (~> 3.1, >= 3.1.0)
babosa (!= 0.3.6)
diffy (~> 3.1, >= 3.1.0)
friendly_id (>= 5.1.0, < 5.3)
globalize (>= 5.1.0.beta1, < 5.2)
refinerycms-core (= 4.0.3)
seo_meta (~> 3.0, >= 3.0.0)
speakingurl-rails (~> 8.0, >= 8.0.0)
refinerycms-resources (4.0.3)
activemodel-serializers-xml (~> 1.0, >= 1.0.1)
acts_as_indexed (~> 0.8.0)
dragonfly (~> 1.1, >= 1.1.0)
globalize (>= 5.1.0.beta1, < 5.2)
refinerycms-core (= 4.0.3)
refinerycms-dragonfly (~> 1.0)
refinerycms-testing (4.0.3)
capybara (~> 2.7)
database_cleaner (~> 1.6)
factory_bot_rails (~> 4.8)
rails-controller-testing (~> 0.1.1)
refinerycms-core (= 4.0.3)
rspec-rails (~> 3.5)
refinerycms-wymeditor (1.1.0) refinerycms-wymeditor (1.1.0)
refinerycms-core (>= 3.0.0, < 5.0) refinerycms-core (>= 3.0.0, < 5.0)
request_store (1.4.1) request_store (1.4.1)
...@@ -280,40 +235,27 @@ GEM ...@@ -280,40 +235,27 @@ GEM
routing-filter (0.6.3) routing-filter (0.6.3)
actionpack (>= 4.2) actionpack (>= 4.2)
activesupport (>= 4.2) activesupport (>= 4.2)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
sass (3.7.4) sass (3.7.4)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7) sass-rails (6.0.0)
railties (>= 4.0.0, < 6) sassc-rails (~> 2.1, >= 2.1.1)
sass (~> 3.1) sassc (2.2.1)
sprockets (>= 2.8, < 4.0) ffi (~> 1.9)
sprockets-rails (>= 2.0, < 4.0) sassc-rails (2.1.2)
tilt (>= 1.1, < 3) railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
seo_meta (3.0.0) seo_meta (3.0.0)
railties (>= 5.0.0) railties (>= 5.0.0)
slop (3.6.0) slop (3.6.0)
speakingurl-rails (8.0.2) speakingurl-rails (8.0.2)
railties (>= 3.1) railties (>= 3.1)
sprockets (3.7.2) sprockets (4.0.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.1)
...@@ -335,12 +277,14 @@ GEM ...@@ -335,12 +277,14 @@ GEM
will_paginate (3.2.1) will_paginate (3.2.1)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zeitwerk (2.2.1)
zilch-authorisation (0.0.1) zilch-authorisation (0.0.1)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
actionmailer (~> 6.0.0)
activerecord-jdbcpostgresql-adapter activerecord-jdbcpostgresql-adapter
activerecord-jdbcsqlite3-adapter activerecord-jdbcsqlite3-adapter
capybara-screenshot capybara-screenshot
...@@ -350,13 +294,12 @@ DEPENDENCIES ...@@ -350,13 +294,12 @@ DEPENDENCIES
pg pg
poltergeist poltergeist
pry pry
refinerycms (~> 4.0.3) refinerycms (~> 4.1.0)!
refinerycms-authentication-devise (~> 2.0.1)! refinerycms-authentication-devise (~> 2.0.1)!
refinerycms-photo-gallery! refinerycms-photo-gallery!
refinerycms-testing (~> 4.0.3)
refinerycms-wymeditor (~> 1.0, >= 1.0.6) refinerycms-wymeditor (~> 1.0, >= 1.0.6)
sass-rails sass-rails
sqlite3 sqlite3
BUNDLED WITH BUNDLED WITH
1.16.1 1.17.3
...@@ -4,9 +4,10 @@ __Photo gallery engine for Refinery CMS.__ ...@@ -4,9 +4,10 @@ __Photo gallery engine for Refinery CMS.__
## Requirements ## Requirements
Currently unreleased version 0.3.x in master branch supports Rails 5.1.x and Refinery CMS ~> 4.0.3 Currently unreleased version 0.4.x in master branch supports Rails 6.0.x and (unreleased) Refinery CMS ~> 5.0
Previous branches supports: Previous branches supports:
* 0-3-stable: Rails 5.1.x and Refinery CMS ~> 4.0.3
* 0-2-stable: Rails 4.2.x and Refinery CMS ~> 3.0.0 * 0-2-stable: Rails 4.2.x and Refinery CMS ~> 3.0.0
* 0-1-stable: Rails 3.2.x and Refinery CMS ~> 2.0.3 * 0-1-stable: Rails 3.2.x and Refinery CMS ~> 2.0.3
......
...@@ -2,7 +2,7 @@ module Refinery ...@@ -2,7 +2,7 @@ module Refinery
module PhotoGallery module PhotoGallery
class Version class Version
@major = 0 @major = 0
@minor = 3 @minor = 4
@tiny = '0' @tiny = '0'
class << self class << self
......
...@@ -18,7 +18,7 @@ Gem::Specification.new do |s| ...@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- spec/*`.split("\n") s.test_files = `git ls-files -- spec/*`.split("\n")
# Runtime dependencies # Runtime dependencies
s.add_dependency 'refinerycms-core', '~> 4.0.3' s.add_dependency 'refinerycms-core', '~> 4.1.0'
s.add_dependency 'mime-types' s.add_dependency 'mime-types'
s.add_dependency 'carrierwave', '~> 1.3.1' s.add_dependency 'carrierwave', '~> 1.3.1'
s.add_dependency 'mini_magick', ">= 4.9.4" s.add_dependency 'mini_magick', ">= 4.9.4"
...@@ -26,5 +26,5 @@ Gem::Specification.new do |s| ...@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
s.add_dependency 'rack', ">= 1.6.11" s.add_dependency 'rack', ">= 1.6.11"
# Development dependencies # Development dependencies
s.add_development_dependency 'refinerycms-testing', '~> 4.0.3' # s.add_development_dependency 'refinerycms-testing', '~> 4.0.3'
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment