Skip to content

Commit

Permalink
Bump rails to 6.1.3.1 and remove mimemagic fork (opf#9129)
Browse files Browse the repository at this point in the history 
https://weblog.rubyonrails.org/2021/3/26/marcel-upgrade-releases/
  • Loading branch information
@oliverguenther
oliverguenther authored Mar 30, 2021
1 parent 9e23fe1 commit 4a9b2cf
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 70 deletions.
4 changes: 0 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ gem 'activerecord-session_store', '~> 2.0.0'
gem 'rails', '~> 6.1.3'
gem 'responders', '~> 3.0'

# Keep mimemagic at older version until rails provides its own
# solution without adding a system dependency. We are GPL ourselves so this is fine.
gem 'mimemagic', git: 'https://github.com/opf/mimemagic', ref: 'bf8d7c2'

gem 'rdoc', '>= 2.4.2'

gem 'doorkeeper', '~> 5.5.0'
Expand Down
123 changes: 57 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
GIT
remote: https://github.com/opf/mimemagic
revision: bf8d7c2b32d9c5aadb46013402af55f23eb71c90
ref: bf8d7c2
specs:
mimemagic (0.3.6)

GIT
remote: https://github.com/opf/omniauth
revision: fe862f986b2e846e291784d2caa3d90a658c67f0
Expand Down Expand Up @@ -190,59 +183,59 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
actioncable (6.1.3)
actionpack (= 6.1.3)
activesupport (= 6.1.3)
actioncable (6.1.3.1)
actionpack (= 6.1.3.1)
activesupport (= 6.1.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.3)
actionpack (= 6.1.3)
activejob (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
actionmailbox (6.1.3.1)
actionpack (= 6.1.3.1)
activejob (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
mail (>= 2.7.1)
actionmailer (6.1.3)
actionpack (= 6.1.3)
actionview (= 6.1.3)
activejob (= 6.1.3)
activesupport (= 6.1.3)
actionmailer (6.1.3.1)
actionpack (= 6.1.3.1)
actionview (= 6.1.3.1)
activejob (= 6.1.3.1)
activesupport (= 6.1.3.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.3)
actionview (= 6.1.3)
activesupport (= 6.1.3)
actionpack (6.1.3.1)
actionview (= 6.1.3.1)
activesupport (= 6.1.3.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actiontext (6.1.3)
actionpack (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
actiontext (6.1.3.1)
actionpack (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
nokogiri (>= 1.8.5)
actionview (6.1.3)
activesupport (= 6.1.3)
actionview (6.1.3.1)
activesupport (= 6.1.3.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.3)
activesupport (= 6.1.3)
activejob (6.1.3.1)
activesupport (= 6.1.3.1)
globalid (>= 0.3.6)
activemodel (6.1.3)
activesupport (= 6.1.3)
activemodel (6.1.3.1)
activesupport (= 6.1.3.1)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.1.3)
activemodel (= 6.1.3)
activesupport (= 6.1.3)
activerecord (6.1.3.1)
activemodel (= 6.1.3.1)
activesupport (= 6.1.3.1)
activerecord-import (1.0.8)
activerecord (>= 3.2)
activerecord-nulldb-adapter (0.7.0)
Expand All @@ -253,14 +246,14 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 3)
railties (>= 5.2.4.1)
activestorage (6.1.3)
actionpack (= 6.1.3)
activejob (= 6.1.3)
activerecord (= 6.1.3)
activesupport (= 6.1.3)
marcel (~> 0.3.1)
mimemagic (~> 0.3.2)
activesupport (6.1.3)
activestorage (6.1.3.1)
actionpack (= 6.1.3.1)
activejob (= 6.1.3.1)
activerecord (= 6.1.3.1)
activesupport (= 6.1.3.1)
marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -578,8 +571,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.0)
messagebird-rest (1.4.2)
meta-tags (2.14.0)
actionpack (>= 3.2.0, < 6.2)
Expand All @@ -588,7 +580,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minisyntax (0.2.5)
minitest (5.14.4)
Expand Down Expand Up @@ -709,20 +701,20 @@ GEM
rack_session_access (0.2.0)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (6.1.3)
actioncable (= 6.1.3)
actionmailbox (= 6.1.3)
actionmailer (= 6.1.3)
actionpack (= 6.1.3)
actiontext (= 6.1.3)
actionview (= 6.1.3)
activejob (= 6.1.3)
activemodel (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
rails (6.1.3.1)
actioncable (= 6.1.3.1)
actionmailbox (= 6.1.3.1)
actionmailer (= 6.1.3.1)
actionpack (= 6.1.3.1)
actiontext (= 6.1.3.1)
actionview (= 6.1.3.1)
activejob (= 6.1.3.1)
activemodel (= 6.1.3.1)
activerecord (= 6.1.3.1)
activestorage (= 6.1.3.1)
activesupport (= 6.1.3.1)
bundler (>= 1.15.0)
railties (= 6.1.3)
railties (= 6.1.3.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -736,9 +728,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (6.1.3)
actionpack (= 6.1.3)
activesupport (= 6.1.3)
railties (6.1.3.1)
actionpack (= 6.1.3.1)
activesupport (= 6.1.3.1)
method_source
rake (>= 0.8.7)
thor (~> 1.0)
Expand Down Expand Up @@ -1002,7 +994,6 @@ DEPENDENCIES
livingstyleguide (~> 2.1.0)
lograge (~> 0.11.0)
meta-tags (~> 2.14.0)
mimemagic!
mini_magick (~> 4.11.0)
multi_json (~> 1.15.0)
my_page!
Expand Down

0 comments on commit 4a9b2cf

Please sign in to comment.