From 765468e0ed737ecae5aaa087399e1989004e7329 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 10 Feb 2022 13:48:49 +0100
Subject: [PATCH] rails 6
---
Gemfile | 2 +-
Gemfile.lock | 147 +++++++++++++++++++++------------------------------
2 files changed, 62 insertions(+), 87 deletions(-)
diff --git a/Gemfile b/Gemfile
index 422fe6d03..d1b9cae28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'sib-api-v3-sdk'
gem 'gdpr'
# Back
-gem 'rails'
+gem 'rails', '~> 6.1'
gem 'rails-i18n'
gem 'devise'
gem 'devise-i18n'
diff --git a/Gemfile.lock b/Gemfile.lock
index e3a7e31cb..b88002f6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/noesya/summernote-rails.git
- revision: dd92b3cd21cfa573daf5d510b08b96698bd0e295
+ revision: 0543165914c4996df00bcd46b77a558819443778
specs:
- summernote-rails (0.8.17.0)
+ summernote-rails (0.8.20.0)
railties (>= 3.1)
GIT
@@ -19,71 +19,65 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.0.2)
- actionpack (= 7.0.2)
- activesupport (= 7.0.2)
+ actioncable (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.2)
- actionpack (= 7.0.2)
- activejob (= 7.0.2)
- activerecord (= 7.0.2)
- activestorage (= 7.0.2)
- activesupport (= 7.0.2)
+ actionmailbox (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
mail (>= 2.7.1)
- net-imap
- net-pop
- net-smtp
- actionmailer (7.0.2)
- actionpack (= 7.0.2)
- actionview (= 7.0.2)
- activejob (= 7.0.2)
- activesupport (= 7.0.2)
+ actionmailer (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ actionview (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
mail (~> 2.5, >= 2.5.4)
- net-imap
- net-pop
- net-smtp
rails-dom-testing (~> 2.0)
- actionpack (7.0.2)
- actionview (= 7.0.2)
- activesupport (= 7.0.2)
- rack (~> 2.0, >= 2.2.0)
+ actionpack (6.1.4.4)
+ actionview (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
+ rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (7.0.2)
- actionpack (= 7.0.2)
- activerecord (= 7.0.2)
- activestorage (= 7.0.2)
- activesupport (= 7.0.2)
- globalid (>= 0.6.0)
+ actiontext (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
nokogiri (>= 1.8.5)
- actionview (7.0.2)
- activesupport (= 7.0.2)
+ actionview (6.1.4.4)
+ activesupport (= 6.1.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (7.0.2)
- activesupport (= 7.0.2)
+ activejob (6.1.4.4)
+ activesupport (= 6.1.4.4)
globalid (>= 0.3.6)
- activemodel (7.0.2)
- activesupport (= 7.0.2)
- activerecord (7.0.2)
- activemodel (= 7.0.2)
- activesupport (= 7.0.2)
- activestorage (7.0.2)
- actionpack (= 7.0.2)
- activejob (= 7.0.2)
- activerecord (= 7.0.2)
- activesupport (= 7.0.2)
- marcel (~> 1.0)
+ activemodel (6.1.4.4)
+ activesupport (= 6.1.4.4)
+ activerecord (6.1.4.4)
+ activemodel (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
+ activestorage (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
+ marcel (~> 1.0.0)
mini_mime (>= 1.1.0)
- activesupport (7.0.2)
+ activesupport (6.1.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
+ zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
annotate (3.2.0)
@@ -165,7 +159,6 @@ GEM
warden (~> 1.2.3)
devise-i18n (1.10.1)
devise (>= 4.8.0)
- digest (3.1.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
encryptor (3.0.0)
@@ -230,7 +223,6 @@ GEM
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
- io-wait (0.2.1)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
@@ -287,21 +279,6 @@ GEM
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nesty (1.0.2)
- net-imap (0.2.3)
- digest
- net-protocol
- strscan
- net-pop (0.1.1)
- digest
- net-protocol
- timeout
- net-protocol (0.1.2)
- io-wait
- timeout
- net-smtp (0.3.1)
- digest
- net-protocol
- timeout
nio4r (2.5.8)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
@@ -323,20 +300,21 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (7.0.2)
- actioncable (= 7.0.2)
- actionmailbox (= 7.0.2)
- actionmailer (= 7.0.2)
- actionpack (= 7.0.2)
- actiontext (= 7.0.2)
- actionview (= 7.0.2)
- activejob (= 7.0.2)
- activemodel (= 7.0.2)
- activerecord (= 7.0.2)
- activestorage (= 7.0.2)
- activesupport (= 7.0.2)
+ rails (6.1.4.4)
+ actioncable (= 6.1.4.4)
+ actionmailbox (= 6.1.4.4)
+ actionmailer (= 6.1.4.4)
+ actionpack (= 6.1.4.4)
+ actiontext (= 6.1.4.4)
+ actionview (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activemodel (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
bundler (>= 1.15.0)
- railties (= 7.0.2)
+ railties (= 6.1.4.4)
+ sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -345,13 +323,12 @@ GEM
rails-i18n (7.0.1)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
- railties (7.0.2)
- actionpack (= 7.0.2)
- activesupport (= 7.0.2)
+ railties (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
method_source
- rake (>= 12.2)
+ rake (>= 0.13)
thor (~> 1.0)
- zeitwerk (~> 2.5)
rake (13.0.6)
randexp (0.1.7)
rb-fsevent (0.11.1)
@@ -417,10 +394,8 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
- strscan (3.0.1)
thor (1.2.1)
tilt (2.0.10)
- timeout (0.2.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.4)
@@ -484,7 +459,7 @@ DEPENDENCIES
pg (~> 1.1)
puma
rack-mini-profiler (~> 2.0)
- rails
+ rails (~> 6.1)
rails-i18n
sanitize
sassc-rails
--
GitLab