Skip to content

Commit 3dc4358

Browse files
committed
Actualiza
1 parent 1b629c7 commit 3dc4358

File tree

4 files changed

+90
-96
lines changed

4 files changed

+90
-96
lines changed

Gemfile

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,130 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
ruby '>=3.0.1'
3+
ruby ">=3.0.1"
44

55

6-
gem 'apexcharts'
6+
gem "apexcharts"
77

8-
gem 'babel-transpiler'
8+
gem "babel-transpiler"
99

10-
gem 'bcrypt'
10+
gem "bcrypt"
1111

12-
gem 'bootsnap', '>=1.1.0', require: false
12+
gem "bootsnap", ">=1.1.0", require: false
1313

14-
gem 'cancancan'
14+
gem "cancancan"
1515

16-
gem 'cocoon', git: 'https://github.com/vtamara/cocoon.git',
17-
branch: 'new_id_with_ajax' # Formularios anidados (algunos con ajax)
16+
gem "cocoon", git: "https://github.com/vtamara/cocoon.git",
17+
branch: "new_id_with_ajax" # Formularios anidados (algunos con ajax)
1818

19-
gem 'coffee-rails'# CoffeeScript para recuersos .js.coffee y vistas
19+
gem "coffee-rails"# CoffeeScript para recuersos .js.coffee y vistas
2020

21-
gem 'color' # Colores RGB en mapa
21+
gem "color" # Colores RGB en mapa
2222

23-
gem 'devise' # Autenticación
23+
gem "devise" # Autenticación
2424

25-
gem 'devise-i18n'
25+
gem "devise-i18n"
2626

27-
gem 'jbuilder' # API JSON facil.
27+
gem "jbuilder" # API JSON facil.
2828

29-
gem 'jsbundling-rails'
29+
gem "jsbundling-rails"
3030

31-
gem 'kt-paperclip', # Anexos
32-
git: 'https://github.com/kreeti/kt-paperclip.git'
31+
gem "kt-paperclip", # Anexos
32+
git: "https://github.com/kreeti/kt-paperclip.git"
3333

34-
gem 'libxml-ruby'
34+
gem "libxml-ruby"
3535

36-
gem 'odf-report' # Genera ODT
36+
gem "odf-report" # Genera ODT
3737

38-
gem 'nokogiri', '>=1.11.1'
38+
gem "nokogiri", ">=1.11.1"
3939

40-
gem 'pg' # Postgresql
40+
gem "pg" # Postgresql
4141

42-
gem 'prawn' # Generación de PDF
42+
gem "prawn" # Generación de PDF
4343

44-
gem 'prawnto_2', '>= 0.3.1', :require => 'prawnto'
44+
gem "prawnto_2", ">= 0.3.1", :require => "prawnto"
4545

46-
gem 'prawn-table'
46+
gem "prawn-table"
4747

48-
gem 'rack-cors'
48+
gem "rack-cors"
4949

50-
gem 'rails', '~> 7.0'
50+
gem "rails", ">= 7.0", "<7.1"
5151

52-
gem 'rails-i18n'
52+
gem "rails-i18n"
5353

54-
gem 'redcarpet'
54+
gem "redcarpet"
5555

56-
gem 'rspreadsheet'
56+
gem "rspreadsheet"
5757

58-
gem 'rubyzip', '>=2.0.0'
58+
gem "rubyzip", ">=2.0.0"
5959

60-
gem 'sassc-rails' # CSS
60+
gem "sassc-rails" # CSS
6161

62-
gem 'simple_form' # Formularios simples
62+
gem "simple_form" # Formularios simples
6363

64-
gem 'sprockets-rails'
64+
gem "sprockets-rails"
6565

66-
gem 'stimulus-rails'
66+
gem "stimulus-rails"
6767

68-
gem 'turbo-rails', '~> 1.0'
68+
gem "turbo-rails", "~> 1.0"
6969

70-
gem 'twitter_cldr' # ICU con CLDR
70+
gem "twitter_cldr" # ICU con CLDR
7171

72-
gem 'tzinfo' # Zonas horarias
72+
gem "tzinfo" # Zonas horarias
7373

74-
gem 'will_paginate' # Listados en páginas
74+
gem "will_paginate" # Listados en páginas
7575

7676

7777
#####
7878
# Motores que se sobrecargan vistas (deben ponerse en orden de apilamiento
7979
# lógico y no alfabetico como las gemas anteriores)
8080

81-
gem 'msip', # Motor generico
82-
git: 'https://gitlab.com/pasosdeJesus/msip.git', branch: 'main'
83-
#path: '../msip'
81+
gem "msip", # Motor generico
82+
git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "main"
83+
#path: "../msip"
8484

85-
gem 'mr519_gen', # Motor de gestion de formularios y encuestas
86-
git: 'https://gitlab.com/pasosdeJesus/mr519_gen.git', branch: 'main'
87-
#path: '../mr519_gen'
85+
gem "mr519_gen", # Motor de gestion de formularios y encuestas
86+
git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "main"
87+
#path: "../mr519_gen"
8888

89-
gem 'heb412_gen', # Motor de nube y llenado de plantillas
90-
git: 'https://gitlab.com/pasosdeJesus/heb412_gen.git', branch: 'main'
91-
#path: '../heb412_gen'
89+
gem "heb412_gen", # Motor de nube y llenado de plantillas
90+
git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "main"
91+
#path: "../heb412_gen"
9292

93-
gem 'sivel2_gen', # Motor Cor1440_gen
94-
git: 'https://gitlab.com/pasosdeJesus/sivel2_gen.git', branch: 'main'
95-
#path: '../sivel2_gen'
93+
gem "sivel2_gen", # Motor Cor1440_gen
94+
git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "main"
95+
#path: "../sivel2_gen"
9696

9797

9898
group :development do
99-
gem 'puma'
99+
gem "puma"
100100

101-
gem 'web-console' # Consola irb en páginas
101+
gem "web-console" # Consola irb en páginas
102102
end
103103

104104

105105
group :development, :test do
106-
gem 'debug' # Depurar
106+
gem "debug" # Depurar
107107

108-
gem 'colorize' # Color en terminal
108+
gem "colorize" # Color en terminal
109109

110-
gem 'dotenv-rails'
110+
gem "dotenv-rails"
111111
end
112112

113113

114114
group :test do
115-
gem 'cuprite'
115+
gem "cuprite"
116116

117-
gem 'capybara'
117+
gem "capybara"
118118

119-
gem 'selenium-webdriver'
119+
gem "selenium-webdriver"
120120

121-
gem 'simplecov'
121+
gem "simplecov"
122122

123-
gem 'spring' # Acelera ejecutando en fondo.
123+
gem "spring" # Acelera ejecutando en fondo.
124124
end
125125

126126

127127
group :production do
128-
gem 'unicorn' # Para despliegue
128+
gem "unicorn" # Para despliegue
129129
end
130130

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GIT
1818

1919
GIT
2020
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
21-
revision: 71495453bb62ca518ca00be3aee5add3f3faa8ff
21+
revision: 31f166f4c14aae30f070b28707338f052b6ba82b
2222
branch: main
2323
specs:
2424
heb412_gen (2.2.0.beta4)
@@ -38,7 +38,7 @@ GIT
3838

3939
GIT
4040
remote: https://gitlab.com/pasosdeJesus/msip.git
41-
revision: 090470149b6fc798f1c056e60c27af6de486543f
41+
revision: 1b98b3ba2b146f2768d4699049b0a2c322adb4ae
4242
branch: main
4343
specs:
4444
msip (2.2.0.beta4)
@@ -58,7 +58,7 @@ GIT
5858

5959
GIT
6060
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
61-
revision: d7b620d767f0f9d4d83866affb74fc2893adcda4
61+
revision: 7f4448f16811cc58c2633bba7866d99d4aac54e6
6262
branch: main
6363
specs:
6464
sivel2_gen (2.2.0.beta4)
@@ -184,7 +184,7 @@ GEM
184184
railties (>= 4.1.0)
185185
responders
186186
warden (~> 1.2.3)
187-
devise-i18n (1.11.1)
187+
devise-i18n (1.12.0)
188188
devise (>= 4.9.0)
189189
docile (1.4.0)
190190
dotenv (2.8.1)
@@ -198,7 +198,7 @@ GEM
198198
concurrent-ruby (~> 1.1)
199199
webrick (~> 1.7)
200200
websocket-driver (>= 0.6, < 0.8)
201-
ffi (1.16.2)
201+
ffi (1.16.3)
202202
globalid (1.2.1)
203203
activesupport (>= 6.1)
204204
i18n (1.14.1)
@@ -227,12 +227,12 @@ GEM
227227
method_source (1.0.0)
228228
mime-types (3.5.1)
229229
mime-types-data (~> 3.2015)
230-
mime-types-data (3.2023.0808)
230+
mime-types-data (3.2023.1003)
231231
mini_mime (1.1.5)
232232
mini_portile2 (2.8.4)
233233
minitest (5.20.0)
234234
msgpack (1.7.2)
235-
net-imap (0.3.7)
235+
net-imap (0.4.0)
236236
date
237237
net-protocol
238238
net-pop (0.1.2)
@@ -308,7 +308,7 @@ GEM
308308
psych (>= 4.0.0)
309309
redcarpet (3.6.0)
310310
regexp_parser (2.8.1)
311-
reline (0.3.8)
311+
reline (0.3.9)
312312
io-console (~> 0.5)
313313
responders (3.1.0)
314314
actionpack (>= 5.2)
@@ -420,7 +420,7 @@ DEPENDENCIES
420420
prawnto_2 (>= 0.3.1)
421421
puma
422422
rack-cors
423-
rails (~> 7.0)
423+
rails (>= 7.0, < 7.1)
424424
rails-i18n
425425
redcarpet
426426
rspreadsheet

db/structure.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7956,6 +7956,7 @@ INSERT INTO "schema_migrations" (version) VALUES
79567956
('20230712163859'),
79577957
('20230722180204'),
79587958
('20230723011110'),
7959-
('20230927001422');
7959+
('20230927001422'),
7960+
('20231007095930');
79607961

79617962

yarn.lock

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@
6969
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
7070

7171
"@rails/actioncable@^7.0":
72-
version "7.0.8"
73-
resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.8.tgz#f44e7517f2d1570f1eabeea457dbeb17ed3a2d12"
74-
integrity sha512-GjYQv89ZOOfbFw8VMNUOG33GXzyAA/TCVoD+742Ob4svm1XXUkd+w+ewqUXd+7VHQtV35y1/O78AGIPeJDTy/g==
72+
version "7.1.0"
73+
resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.0.tgz#9b1543b0abf5a0a7ef7088882ee3d6092b2745b3"
74+
integrity sha512-MBGzAQHOk+sXblpCQsM0MPxQDzvTLFwaFu8jqYbfWDejpZPszo9xaAOF/3+iv7ab1o6PFiTpdbh+PR4osofIWw==
7575

7676
"@rails/ujs@^7.0.1":
77-
version "7.0.8"
78-
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.8.tgz#59853367d0827b3955d2c4bedfd5eba4a79d3422"
79-
integrity sha512-tOQQBVH8LsUpGXqDnk+kaOGVsgZ8maHAhEiw3Git3p88q+c0Slgu47HuDnL6sVxeCfz24zbq7dOjsVYDiTpDIA==
77+
version "7.1.0"
78+
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.0.tgz#144ec54b1cc53aa24713cafc29bf8a8d52ac3d24"
79+
integrity sha512-cO8+HREI8hhJDaFyzGCA4AL9/EotHYSTz1v7aQmfZmUdanx/ppXe+MPE4dly2/MtC6Ha6K2Dkzo7bkDGc46y6Q==
8080

8181
"@types/parse-json@^4.0.0":
8282
version "4.0.0"
@@ -96,9 +96,9 @@ ansi-styles@^3.2.1:
9696
color-convert "^1.9.0"
9797

9898
apexcharts@^3.29.0:
99-
version "3.42.0"
100-
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.42.0.tgz#143eb4a12d93c59a37dd88efcf0c7ed0d9ab8735"
101-
integrity sha512-hYhzZqh2Efny9uiutkGU2M/EarJ4Nn8s6dxZ0C7E7N+SV4d1xjTioXi2NLn4UKVJabZkb3HnpXDoumXgtAymwg==
99+
version "3.43.0"
100+
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.43.0.tgz#6906154605ae981f6e68c493ecfdfa57bdb55ce7"
101+
integrity sha512-YPw1aLatPQMUqVLMp5d+LDaXFi4QrRQND72/XO7/2NJdg+R5MjE9sifJ0GzOfgoZM7ltBUTjwfSxIvwR/9V8yw==
102102
dependencies:
103103
"@yr/monotone-cubic-spline" "^1.0.3"
104104
svg.draggable.js "^2.2.2"
@@ -311,17 +311,12 @@ escape-string-regexp@^1.0.5:
311311
integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
312312

313313
fast-xml-parser@^4.1.3:
314-
version "4.3.1"
315-
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.1.tgz#4f89c31e4c392d6e3d68b299733cad0c2d50d495"
316-
integrity sha512-viVv3xb8D+SiS1W4cv4tva3bni08kAkx0gQnWrykMM8nXPc1FxqZPU00dCEVjkiCg4HoXd2jC4x29Nzg/l2DAA==
314+
version "4.3.2"
315+
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz#761e641260706d6e13251c4ef8e3f5694d4b0d79"
316+
integrity sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==
317317
dependencies:
318318
strnum "^1.0.5"
319319

320-
function-bind@^1.1.1:
321-
version "1.1.1"
322-
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
323-
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
324-
325320
glob-parent@^5.1.2:
326321
version "5.1.2"
327322
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -342,11 +337,9 @@ has-flag@^3.0.0:
342337
integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
343338

344339
has@^1.0.3:
345-
version "1.0.3"
346-
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
347-
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
348-
dependencies:
349-
function-bind "^1.1.1"
340+
version "1.0.4"
341+
resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
342+
integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
350343

351344
import-fresh@^3.2.1:
352345
version "3.3.0"
@@ -465,9 +458,9 @@ popper.js@^2.0.0-next.4:
465458
integrity sha512-rwX+OiRozGJyNzo+b39WE1yh1VE7+FuDAbMIP1j3hUQN4DP0WEOEbRlHC7dDgoIDpBQSm5rr+nCoPktbQCNhFQ==
466459

467460
postcss@^8.2.10:
468-
version "8.4.30"
469-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7"
470-
integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==
461+
version "8.4.31"
462+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
463+
integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
471464
dependencies:
472465
nanoid "^3.3.6"
473466
picocolors "^1.0.0"

0 commit comments

Comments
 (0)