Skip to content

Commit

Permalink
A rails 6.1 tras solucion a rails/rails#41038
Browse files Browse the repository at this point in the history
  • Loading branch information
@vtamara
vtamara committed Feb 17, 2021
1 parent 4f62129 commit 9c88c01
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 174 deletions.
7 changes: 4 additions & 3 deletions Gemfile
View file
Expand Up @@ -36,7 +36,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'

Expand Down Expand Up @@ -64,8 +65,8 @@ gem 'will_paginate' # Listados en páginas
# lógico y no alfabetico como las gemas anteriores)

gem 'sip', # Motor generico,
git: 'https://github.com/pasosdeJesus/sip.git', branch: :main
#path: '../sip'
#git: 'https://github.com/pasosdeJesus/sip.git', branch: :main
path: '../sip'

gem 'mr519_gen', # Motor de gestion de formularios y encuestas
git: 'https://github.com/pasosdeJesus/mr519_gen.git', branch: :main
Expand Down
199 changes: 103 additions & 96 deletions Gemfile.lock
View file
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/pasosdeJesus/heb412_gen.git
revision: b0f199e8bcbb29560b455f3ac8f36ffd755ee1fe
revision: f40c7525129cd57673adff18e31c16a45e3a9927
branch: main
specs:
heb412_gen (1.0.b6)
Expand All @@ -11,17 +11,108 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/mr519_gen.git
revision: bf5d67ab22fe5ab0869ad7570d541cd516e5c908
revision: 27ba5b9217b92a536ff84c1ac002f4ccd4037acb
branch: main
specs:
mr519_gen (0.2.0)
rails
sip

GIT
remote: https://github.com/pasosdeJesus/sip.git
revision: c32c27cbfbe0810ac5416d2842dd66444bec4e82
branch: main
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
branch: new_id_with_ajax
specs:
cocoon (1.2.11)

PATH
remote: ../sip
specs:
sip (2.0.b11)
cancancan
Expand All @@ -37,71 +128,9 @@ GIT
twitter_cldr
will_paginate

GIT
remote: https://github.com/vtamara/cocoon.git
revision: 9f1892403c3dbdb8f7d457a06f237ff58e7dfb07
branch: new_id_with_ajax
specs:
cocoon (1.2.11)

GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.4)
actionpack (= 6.0.3.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
mail (>= 2.7.1)
actionmailer (6.0.3.4)
actionpack (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.4)
actionview (= 6.0.3.4)
activesupport (= 6.0.3.4)
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.4)
actionpack (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
nokogiri (>= 1.8.5)
actionview (6.0.3.4)
activesupport (= 6.0.3.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.4)
activesupport (= 6.0.3.4)
globalid (>= 0.3.6)
activemodel (6.0.3.4)
activesupport (= 6.0.3.4)
activerecord (6.0.3.4)
activemodel (= 6.0.3.4)
activesupport (= 6.0.3.4)
activestorage (6.0.3.4)
actionpack (= 6.0.3.4)
activejob (= 6.0.3.4)
activerecord (= 6.0.3.4)
marcel (~> 0.3.1)
activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
andand (1.3.3)
bcrypt (3.1.16)
bindex (0.8.1)
Expand Down Expand Up @@ -147,7 +176,7 @@ GEM
ffi (1.14.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.8)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
Expand All @@ -165,7 +194,7 @@ GEM
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mime-types-data (3.2021.0212)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
Expand Down Expand Up @@ -204,29 +233,14 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.4)
actioncable (= 6.0.3.4)
actionmailbox (= 6.0.3.4)
actionmailer (= 6.0.3.4)
actionpack (= 6.0.3.4)
actiontext (= 6.0.3.4)
actionview (= 6.0.3.4)
activejob (= 6.0.3.4)
activemodel (= 6.0.3.4)
activerecord (= 6.0.3.4)
activestorage (= 6.0.3.4)
activesupport (= 6.0.3.4)
bundler (>= 1.3.0)
railties (= 6.0.3.4)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
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)
Expand All @@ -236,12 +250,6 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
railties (6.0.3.4)
actionpack (= 6.0.3.4)
activesupport (= 6.0.3.4)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (13.0.3)
redcarpet (3.5.1)
responders (3.0.1)
Expand Down Expand Up @@ -281,15 +289,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)
Expand Down Expand Up @@ -334,7 +341,7 @@ DEPENDENCIES
prawn-table
prawnto_2
puma
rails (~> 6.0.3.4)
rails!
rails-controller-testing
rails-erd
rails-i18n
Expand All @@ -353,4 +360,4 @@ DEPENDENCIES
will_paginate

BUNDLED WITH
2.2.3
2.2.11
2 changes: 1 addition & 1 deletion test/dummy/.env.plantilla
View file
Expand Up @@ -47,7 +47,7 @@ if (test "$PUERTODES" = "") then {

# Modo Producción con unicorn
if (test "$RC" = "") then {
export RC=sip
export RC=sivel2
} fi;
if (test "$PUERTOUNICORN" = "") then {
export PUERTOUNICORN=3015
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/bin/corre
View file
Expand Up @@ -89,7 +89,7 @@ FileUtils.chdir RAIZ_AP do
ord += "-b '#{ENV['IPDES']}' "
puts "#{ord}"
elsif ENV['RAILS_ENV'] == 'production'
if !File.exist("/etc/rc.d/#{ENV['RC']}")
if !File.exists?("/etc/rc.d/#{ENV['RC']}")
puts "\nFalta script /etc/rc.d/#{ENV['RC']}"
exit 1
end
Expand Down

0 comments on commit 9c88c01

Please sign in to comment.