diff --git a/Gemfile b/Gemfile index 40adc84f..44c25159 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,8 @@ gem 'prawnto_2', :require => 'prawnto' gem 'prawn-table' -gem 'rails', '~> 6.0.3.4' +gem 'rails', #'~> 6.0.3.4' + git: 'https://github.com/rails/rails.git', branch: '6-1-stable' gem 'rails-i18n' diff --git a/Gemfile.lock b/Gemfile.lock index 516b44b4..4a9d3162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GIT GIT remote: https://github.com/pasosdeJesus/mr519_gen.git - revision: 26eeb05ff090f82f24a00fe78e4ba70336c149d0 + revision: 27ba5b9217b92a536ff84c1ac002f4ccd4037acb branch: main specs: mr519_gen (0.2.0) @@ -20,7 +20,7 @@ GIT GIT remote: https://github.com/pasosdeJesus/sip.git - revision: 687275bf8222107cd6e13793a34171b03c3afcb2 + revision: 32818b861269267d744cfbb9f033c9919231a2d7 branch: main specs: sip (2.0.b11) @@ -37,6 +37,92 @@ GIT twitter_cldr will_paginate +GIT + remote: https://github.com/rails/rails.git + revision: e322277be55452665cba6ea6925d2e93a3a04092 + branch: 6-1-stable + specs: + actioncable (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) + mail (>= 2.7.1) + actionmailer (6.1.2.1) + actionpack (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activesupport (= 6.1.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.2.1) + actionview (= 6.1.2.1) + activesupport (= 6.1.2.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) + actiontext (6.1.2.1) + actionpack (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) + nokogiri (>= 1.8.5) + actionview (6.1.2.1) + activesupport (= 6.1.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.2.1) + activesupport (= 6.1.2.1) + globalid (>= 0.3.6) + activemodel (6.1.2.1) + activesupport (= 6.1.2.1) + activerecord (6.1.2.1) + activemodel (= 6.1.2.1) + activesupport (= 6.1.2.1) + activestorage (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activesupport (= 6.1.2.1) + marcel (~> 0.3.1) + mimemagic (~> 0.3.2) + activesupport (6.1.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + rails (6.1.2.1) + actioncable (= 6.1.2.1) + actionmailbox (= 6.1.2.1) + actionmailer (= 6.1.2.1) + actionpack (= 6.1.2.1) + actiontext (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activemodel (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) + bundler (>= 1.15.0) + railties (= 6.1.2.1) + sprockets-rails (>= 2.0.0) + railties (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) + method_source + rake (>= 0.8.7) + thor (~> 1.0) + GIT remote: https://github.com/vtamara/cocoon.git revision: 9f1892403c3dbdb8f7d457a06f237ff58e7dfb07 @@ -59,61 +145,6 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.5) - actionpack (= 6.0.3.5) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.5) - actionpack (= 6.0.3.5) - activejob (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) - mail (>= 2.7.1) - actionmailer (6.0.3.5) - actionpack (= 6.0.3.5) - actionview (= 6.0.3.5) - activejob (= 6.0.3.5) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.3.5) - actionview (= 6.0.3.5) - activesupport (= 6.0.3.5) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.5) - actionpack (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) - nokogiri (>= 1.8.5) - actionview (6.0.3.5) - activesupport (= 6.0.3.5) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.5) - activesupport (= 6.0.3.5) - globalid (>= 0.3.6) - activemodel (6.0.3.5) - activesupport (= 6.0.3.5) - activerecord (6.0.3.5) - activemodel (= 6.0.3.5) - activesupport (= 6.0.3.5) - activestorage (6.0.3.5) - actionpack (= 6.0.3.5) - activejob (= 6.0.3.5) - activerecord (= 6.0.3.5) - marcel (~> 0.3.1) - activesupport (6.0.3.5) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) andand (1.3.3) @@ -242,21 +273,6 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.5) - actioncable (= 6.0.3.5) - actionmailbox (= 6.0.3.5) - actionmailer (= 6.0.3.5) - actionpack (= 6.0.3.5) - actiontext (= 6.0.3.5) - actionview (= 6.0.3.5) - activejob (= 6.0.3.5) - activemodel (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) - bundler (>= 1.3.0) - railties (= 6.0.3.5) - sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -264,7 +280,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-erd (1.6.0) + rails-erd (1.6.1) activerecord (>= 4.2) activesupport (>= 4.2) choice (~> 0.2.0) @@ -274,12 +290,6 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.5) - actionpack (= 6.0.3.5) - activesupport (= 6.0.3.5) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) rake (13.0.3) redcarpet (3.5.1) regexp_parser (2.0.3) @@ -340,15 +350,14 @@ GEM terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) thor (1.1.0) - thread_safe (0.3.6) tilt (2.0.10) ttfunk (1.7.0) twitter_cldr (6.4.0) camertron-eprun cldr-plurals-runtime-rb (~> 1.1) tzinfo - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) warden (1.2.9) rack (>= 2.0.9) web-console (4.1.0) @@ -400,7 +409,7 @@ DEPENDENCIES prawn-table prawnto_2 puma - rails (~> 6.0.3.4) + rails! rails-controller-testing rails-erd rails-i18n @@ -421,4 +430,4 @@ DEPENDENCIES will_paginate BUNDLED WITH - 2.2.3 + 2.2.11 diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css index ea8804d2..84b724a5 100644 --- a/test/dummy/app/assets/stylesheets/application.css +++ b/test/dummy/app/assets/stylesheets/application.css @@ -10,7 +10,7 @@ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. * - *= require_tree . *= require cor1440_gen/application.css + *= require_tree . *= require_self */