diff --git a/Gemfile b/Gemfile index b5ec775..b7ee533 100644 --- a/Gemfile +++ b/Gemfile @@ -83,11 +83,11 @@ gem "paperclip" gem "tzinfo" # Motor de sistemas de información estilo Pasos de Jesús -gem 'sip', git: "https://github.com/pasosdeJesus/sip.git", branch: :rails6 +gem 'sip', git: "https://github.com/pasosdeJesus/sip.git" #gem 'sip', path: '../sip' # Motor -gem 'sal7711_gen', git: "https://github.com/pasosdeJesus/sal7711_gen.git", branch: :rails6 +gem 'sal7711_gen', git: "https://github.com/pasosdeJesus/sal7711_gen.git" #gem 'sal7711_gen', path: '../sal7711_gen' diff --git a/Gemfile.lock b/Gemfile.lock index 29728d7..1dfef6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,16 @@ GIT remote: https://github.com/pasosdeJesus/sal7711_gen.git - revision: 349ac7099af0780c2792ff9bc36212cd1acb9a5c - branch: rails6 + revision: eb7fb8a6aed329d409c50a7fbdd7e2a2001af60e specs: - sal7711_gen (1.0.b1) + sal7711_gen (1.0.b2) rails sip GIT remote: https://github.com/pasosdeJesus/sip.git - revision: c0f502a0235fbca573649b5565e0c15b97529e32 - branch: rails6 + revision: d8f54c204a323923c6b9a7bd636db93362f93f11 specs: - sip (2.0.b5) + sip (2.0.b6) bootstrap-datepicker-rails cancancan chosen-rails @@ -113,13 +111,13 @@ GEM callsite (0.0.11) camertron-eprun (1.1.1) cancancan (3.0.1) - capybara (3.20.2) + capybara (3.21.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (~> 1.5) xpath (~> 3.2) cldr-plurals-runtime-rb (1.0.1) climate_control (0.2.0) @@ -218,7 +216,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.1) rack (2.0.7) rack-contrib (2.1.0)