diff --git a/Gemfile b/Gemfile index f3f57e24..d67c5ddd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,17 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.0' +gem 'rails', '~> 5.2.4', '>= 5.2.4.4' # This is needed until upstream projects update their gemspecs # This avoids a vulnerability in 3.7.1 gem 'sprockets', '3.7.2' gem 'rack' -gem 'ransack' +gem 'ransack', '>= 1.8.8' gem 'carrierwave' gem 'pg', '~> 1.0.0' gem 'rmagick', '~> 2.15.4' -gem 'simple_form', '~> 5.0.0' +gem 'simple_form', '~> 5.0.1' gem 'redcarpet' gem 'geocoder' gem 'cancancan' @@ -20,7 +20,7 @@ gem 'rqrcode' gem 'vcardigan' gem 'therubyracer' -gem 'jquery-turbolinks' +gem 'jquery-turbolinks', '>= 2.1.0' source 'https://rails-assets.org' do gem 'rails-assets-datetimepicker' @@ -39,10 +39,10 @@ gem 'paper_trail' gem 'cocoon' group :test, :development do - gem 'dotenv-rails' + gem 'dotenv-rails', '>= 2.4.0' gem 'thin' - gem 'rspec-rails' - gem "factory_bot_rails", "~> 4.0" + gem 'rspec-rails', '>= 3.7.2' + gem "factory_bot_rails", "~> 4.8", ">= 4.8.2" gem 'capybara' # Use selenium and chrome for handling JS automated testing gem 'selenium-webdriver' @@ -53,7 +53,7 @@ group :test, :development do gem 'letter_opener' gem 'better_errors' gem 'binding_of_caller' - gem 'meta_request' + gem 'meta_request', '>= 0.6.0' gem 'database_cleaner', '1.0.1' gem 'test-unit' gem 'pry' @@ -63,7 +63,7 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.0' + gem 'web-console', '~> 3.6', '>= 3.6.1' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' @@ -85,18 +85,18 @@ group :test do gem 'shoulda-matchers' gem 'simplecov' gem 'puma' - gem 'rails-controller-testing' + gem 'rails-controller-testing', '>= 1.0.2' # Allows you to freeze time during tests gem 'timecop' end -gem 'sass-rails' +gem 'sass-rails', '>= 5.0.7' gem 'uglifier', '>= 1.0.3' # Use CoffeeScript for .coffee assets and views gem 'coffee-rails', '~> 4.2.2' # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '>= 4.3.3' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder @@ -106,5 +106,5 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use ActiveModel has_secure_password gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-ui-rails' +gem 'jquery-ui-rails', '>= 6.0.1' gem 'bootstrap-sass', '3.3.7' diff --git a/Gemfile.lock b/Gemfile.lock index 039d4044..e1afee20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,43 +9,43 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.2.0) - actionpack (= 5.2.0) + actioncable (5.2.4.4) + actionpack (= 5.2.4.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) + actionmailer (5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0) - actionview (= 5.2.0) - activesupport (= 5.2.0) - rack (~> 2.0) + actionpack (5.2.4.4) + actionview (= 5.2.4.4) + activesupport (= 5.2.4.4) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.0) - activesupport (= 5.2.0) + actionview (5.2.4.4) + activesupport (= 5.2.4.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0) - activesupport (= 5.2.0) + activejob (5.2.4.4) + activesupport (= 5.2.4.4) globalid (>= 0.3.6) - activemodel (5.2.0) - activesupport (= 5.2.0) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) + activemodel (5.2.4.4) + activesupport (= 5.2.4.4) + activerecord (5.2.4.4) + activemodel (= 5.2.4.4) + activesupport (= 5.2.4.4) arel (>= 9.0) - activestorage (5.2.0) - actionpack (= 5.2.0) - activerecord (= 5.2.0) + activestorage (5.2.4.4) + actionpack (= 5.2.4.4) + activerecord (= 5.2.4.4) marcel (~> 0.3.1) - activesupport (5.2.0) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,21 +59,20 @@ GEM arel (9.0.0) autoprefixer-rails (8.3.0) execjs - bcrypt (3.1.11) + bcrypt (3.1.16) bcrypt-ruby (3.0.1) better_errors (2.4.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindex (0.5.0) + bindex (0.8.1) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) - callsite (0.0.11) cancancan (2.2.0) capistrano (3.10.2) airbrussh (>= 1.0.0) @@ -109,8 +108,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - crass (1.0.5) + concurrent-ruby (1.1.7) + crass (1.0.6) daemons (1.2.6) database_cleaner (1.0.1) debug_inspector (0.0.3) @@ -120,27 +119,27 @@ GEM railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.3.0) - dotenv (2.4.0) - dotenv-rails (2.4.0) - dotenv (= 2.4.0) - railties (>= 3.2, < 6.0) + dotenv (2.7.6) + dotenv-rails (2.7.6) + dotenv (= 2.7.6) + railties (>= 3.2) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - erubi (1.7.1) + erubi (1.9.0) eventmachine (1.2.5) execjs (2.7.0) - factory_bot (4.8.2) + factory_bot (4.11.1) activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) railties (>= 3.0.0) - ffi (1.9.25) + ffi (1.13.1) formatador (0.2.5) geocoder (1.4.7) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) guard (2.14.2) formatador (>= 0.2.4) @@ -162,12 +161,12 @@ GEM guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) http_parser.rb (0.6.0) - i18n (1.0.1) + i18n (1.8.5) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) - jquery-rails (4.3.3) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -188,33 +187,32 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.3.1) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.2) + marcel (0.3.3) mimemagic (~> 0.3.2) - meta_request (0.6.0) - callsite (~> 0.0, >= 0.0.11) + meta_request (0.7.2) rack-contrib (>= 1.1, < 3) - railties (>= 3.0.0, < 6) - method_source (0.9.0) + railties (>= 3.0.0, < 7) + method_source (0.9.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_mime (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.2) multi_json (1.13.1) nenv (0.3.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (4.2.0) - nio4r (2.3.0) - nokogiri (1.10.5) + nio4r (2.5.3) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -224,31 +222,31 @@ GEM activerecord (>= 4.2, < 5.3) request_store (~> 1.1) pg (1.0.0) - polyamorous (1.3.3) - activerecord (>= 3.0) + polyamorous (2.3.2) + activerecord (>= 5.2.1) power_assert (1.1.1) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.2) puma (3.12.2) - rack (2.0.6) - rack-contrib (2.0.1) + rack (2.2.3) + rack-contrib (2.2.0) rack (~> 2.0) - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.0) - actioncable (= 5.2.0) - actionmailer (= 5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) - activemodel (= 5.2.0) - activerecord (= 5.2.0) - activestorage (= 5.2.0) - activesupport (= 5.2.0) + rails (5.2.4.4) + actioncable (= 5.2.4.4) + actionmailer (= 5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) + activemodel (= 5.2.4.4) + activerecord (= 5.2.4.4) + activestorage (= 5.2.4.4) + activesupport (= 5.2.4.4) bundler (>= 1.3.0) - railties (= 5.2.0) + railties (= 5.2.4.4) sprockets-rails (>= 2.0.0) rails-assets-datetimepicker (2.5.20) rails-assets-jquery (>= 1.7.2) @@ -258,40 +256,39 @@ GEM rails-assets-jquery-mousewheel (3.1.13) rails-assets-jquery (>= 1.2.2) rails-assets-php-date-formatter (1.3.4) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + 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-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.0) - actionpack (= 5.2.0) - activesupport (= 5.2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.4.4) + actionpack (= 5.2.4.4) + activesupport (= 5.2.4.4) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) raindrops (0.19.0) - rake (12.3.1) - ransack (1.8.8) - actionpack (>= 3.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + rake (13.0.1) + ransack (2.3.2) + activerecord (>= 5.2.1) + activesupport (>= 5.2.1) i18n - polyamorous (~> 1.3.2) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + polyamorous (= 2.3.2) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) rdoc (4.3.0) redcarpet (3.4.0) ref (2.0.0) request_store (1.4.1) rack (>= 1.4) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) rmagick (2.15.4) rqrcode (0.10.1) chunky_png (~> 1.0) @@ -318,17 +315,21 @@ GEM rspec-support (3.7.1) ruby_dep (1.5.0) rubyzip (1.2.2) - sass (3.5.6) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -338,7 +339,7 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - simple_form (5.0.1) + simple_form (5.0.2) actionpack (>= 5.0) activemodel (>= 5.0) simplecov (0.16.1) @@ -351,7 +352,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -367,18 +368,18 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) timecop (0.9.1) - turbolinks (5.1.1) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) twilio-ruby (4.11.1) builder (>= 2.1.2) jwt (~> 1.0) multi_json (>= 1.3.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.10) execjs (>= 0.3.0, < 3) @@ -386,9 +387,9 @@ GEM kgio (~> 2.6) raindrops (~> 0.7) vcardigan (0.0.9) - warden (1.2.7) - rack (>= 1.0) - web-console (3.6.1) + warden (1.2.9) + rack (>= 2.0.9) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) @@ -397,9 +398,9 @@ GEM nokogiri (~> 1.6) rubyzip (~> 1.0) selenium-webdriver (>= 3.0, < 4.0) - websocket-driver (0.7.0) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.5) xpath (3.0.0) nokogiri (~> 1.8) @@ -421,37 +422,37 @@ DEPENDENCIES coffee-rails (~> 4.2.2) database_cleaner (= 1.0.1) devise (~> 4.4.3) - dotenv-rails - factory_bot_rails (~> 4.0) + dotenv-rails (>= 2.4.0) + factory_bot_rails (~> 4.8, >= 4.8.2) geocoder guard-livereload guard-rspec jbuilder (~> 2.0) - jquery-rails - jquery-turbolinks - jquery-ui-rails + jquery-rails (>= 4.3.3) + jquery-turbolinks (>= 2.1.0) + jquery-ui-rails (>= 6.0.1) launchy letter_opener - meta_request + meta_request (>= 0.6.0) noisy_partials! paper_trail pg (~> 1.0.0) pry puma rack - rails (~> 5.2.0) + rails (~> 5.2.4, >= 5.2.4.4) rails-assets-datetimepicker! - rails-controller-testing - ransack + rails-controller-testing (>= 1.0.2) + ransack (>= 1.8.8) redcarpet rmagick (~> 2.15.4) rqrcode - rspec-rails - sass-rails + rspec-rails (>= 3.7.2) + sass-rails (>= 5.0.7) sdoc (~> 0.4.0) selenium-webdriver shoulda-matchers - simple_form (~> 5.0.0) + simple_form (~> 5.0.1) simplecov spring sprockets (= 3.7.2) @@ -464,8 +465,8 @@ DEPENDENCIES uglifier (>= 1.0.3) unicorn vcardigan - web-console (~> 3.0) + web-console (~> 3.6, >= 3.6.1) webdrivers (~> 4.0) BUNDLED WITH - 1.16.6 + 1.17.3