Skip to content

Commit

Permalink
Actualiza a rails 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Aug 27, 2024
1 parent 15e6fa4 commit 3421dac
Show file tree
Hide file tree
Showing 25 changed files with 356 additions and 323 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ gem "rack", "~> 2"

gem "rack-cors"

gem "rails", ">= 7.1", "<7.2"
gem "rails", "~> 7.2"
#git: "https://github.com/rails/rails.git", branch: "6-1-stable"

gem "rails-i18n"
Expand Down
152 changes: 75 additions & 77 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,30 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
revision: 3695771db89aee8864f4807ba32aedb4a9c762ab
revision: 7eea7af9fade94b84d2ea674eefdf24971815c47
branch: main
specs:
heb412_gen (2.3.0.alfa1)
heb412_gen (2.3.0.alfa2)
mr519_gen
msip
redcarpet
rspreadsheet

GIT
remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
revision: 84f57864341b7bfa82084ce993b0e815769caf7f
revision: 22377b6b7e036add62bffa62f66c6b7d7962fa09
branch: main
specs:
mr519_gen (2.3.0.alfa1)
mr519_gen (2.3.0.alfa2)
msip
rails

GIT
remote: https://gitlab.com/pasosdeJesus/msip.git
revision: 30d642ca98c6ab54be31ec76d4d3bbc76efcd5cd
revision: 31bbedbafb0b8ce47e368f72adb50fb5ca5c413e
branch: main
specs:
msip (2.3.0.alfa1)
msip (2.3.0.alfa2)
cancancan (~> 3)
devise (~> 4)
devise-i18n (~> 1)
Expand All @@ -75,91 +75,87 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: 35cecc9dbcbe43d64166f1462b8e3673bde7e6ae
revision: 8a320b2fd93ee0ac153b443a453719f1663155bd
branch: main
specs:
sivel2_gen (2.3.0.alfa1)
sivel2_gen (2.3.0.alfa2)
color
devise
rails

GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.4)
actionpack (= 7.1.4)
activesupport (= 7.1.4)
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.4)
actionpack (= 7.1.4)
activejob (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.4)
actionpack (= 7.1.4)
actionview (= 7.1.4)
activejob (= 7.1.4)
activesupport (= 7.1.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.4)
actionview (= 7.1.4)
activesupport (= 7.1.4)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.4)
actionpack (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.4)
activesupport (= 7.1.4)
actionview (7.2.1)
activesupport (= 7.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.4)
activesupport (= 7.1.4)
activejob (7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.3.6)
activemodel (7.1.4)
activesupport (= 7.1.4)
activerecord (7.1.4)
activemodel (= 7.1.4)
activesupport (= 7.1.4)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
timeout (>= 0.4.0)
activestorage (7.1.4)
actionpack (= 7.1.4)
activejob (= 7.1.4)
activerecord (= 7.1.4)
activesupport (= 7.1.4)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
marcel (~> 1.0)
activesupport (7.1.4)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
acts_as_list (1.2.2)
activerecord (>= 6.1)
activesupport (>= 6.1)
Expand Down Expand Up @@ -266,6 +262,7 @@ GEM
railties (>= 6.0.0)
kgio (2.11.4)
libxml-ruby (5.0.3)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -283,7 +280,6 @@ GEM
mini_portile2 (2.8.7)
minitest (5.25.1)
msgpack (1.7.2)
mutex_m (0.2.0)
net-imap (0.4.14)
date
net-protocol
Expand Down Expand Up @@ -341,20 +337,20 @@ GEM
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.4)
actioncable (= 7.1.4)
actionmailbox (= 7.1.4)
actionmailer (= 7.1.4)
actionpack (= 7.1.4)
actiontext (= 7.1.4)
actionview (= 7.1.4)
activejob (= 7.1.4)
activemodel (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
bundler (>= 1.15.0)
railties (= 7.1.4)
railties (= 7.2.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -370,10 +366,10 @@ GEM
rails-i18n (7.0.9)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.1.4)
actionpack (= 7.1.4)
activesupport (= 7.1.4)
irb
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand Down Expand Up @@ -406,6 +402,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.3.1)
simple_form (5.3.1)
actionpack (>= 5.2)
activemodel (>= 5.2)
Expand Down Expand Up @@ -447,6 +444,7 @@ GEM
unicorn (6.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.1)
Expand Down Expand Up @@ -512,7 +510,7 @@ DEPENDENCIES
puma
rack (~> 2)
rack-cors
rails (>= 7.1, < 7.2)
rails (~> 7.2)
rails-erd
rails-i18n
redcarpet
Expand All @@ -534,4 +532,4 @@ DEPENDENCIES
will_paginate

BUNDLED WITH
2.5.17
2.5.18
12 changes: 9 additions & 3 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ import './jquery'
import 'popper.js' // Dialogos emergentes usados por bootstrap
import * as bootstrap from 'bootstrap' // Maquetacion y elementos de diseño
import 'chosen-js/chosen.jquery'; // Cuadros de seleccion potenciados
import 'bootstrap-datepicker'
import 'bootstrap-datepicker/dist/locales/bootstrap-datepicker.es.min.js'

import Msip__Motor from "./controllers/msip/motor"
window.Msip__Motor = Msip__Motor
Msip__Motor.iniciar() // Este se ejecuta una vez cuando se está cargando la aplicación tal vez antes que la página completa o los recursos

// Apexcharts
import ApexCharts from 'apexcharts'
Expand Down Expand Up @@ -65,6 +67,8 @@ promesaRecursosSprocketsYDocumento.then((mensaje) => {
apo214_prepara_eventos_comunes(root);
sivel2_gen_prepara_eventos_unicos(root);

Msip__Motor.ejecutarAlCargarDocumentoYRecursos() // Este se ejecuta cada vez que se carga una página que no está en cache y tipicamente después de que se ha cargado la página completa y los recursos

var p = new URL(document.URL).pathname.split('/')
var p2ult = ''
if (p.length>2) {
Expand All @@ -86,7 +90,9 @@ document.addEventListener('turbo:load', (e) => {

console.log('Escuchador turbo:load')

msip_ejecutarAlCargarPagina(window)
msip_ejecutarAlCargarPagina(window) // Establece puntomontaje
Msip__Motor.ejecutarAlCargarPagina()

})

import "./controllers"
8 changes: 6 additions & 2 deletions bin/brakeman
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#!/bin/sh
#!/usr/bin/env ruby
require "rubygems"
require "bundler/setup"

bundle exec brakeman $@
ARGV.unshift("--ensure-latest")

load Gem.bin_path("brakeman", "brakeman")
8 changes: 6 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env ruby
require "fileutils"

# path to your application root.
APP_ROOT = File.expand_path("..", __dir__)
APP_NAME = "sivel2"

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
system(*args, exception: true)
end

FileUtils.chdir APP_ROOT do
Expand All @@ -30,4 +30,8 @@ FileUtils.chdir APP_ROOT do

puts "\n== Restarting application server =="
system! "bin/rails restart"

# puts "\n== Configuring puma-dev =="
# system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
# system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
end
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Application < Rails::Application
config.hosts.concat(
ENV.fetch('CONFIG_HOSTS', 'defensor.info').downcase.split(";"))

config.relative_url_root = ENV.fetch('RUTA_RELATIVA', "/sivel2_2")
config.relative_url_root = ENV.fetch('RUTA_RELATIVA', "/sivel2")

config.action_dispatch.default_headers = {
'X-Frame-Options' => 'ALLOW'
Expand Down
Loading

0 comments on commit 3421dac

Please sign in to comment.