diff --git a/Gemfile b/Gemfile index 0c12b2b500..41e4cccbb5 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "spreadsheet" # For XLSForm export gem "term-ansicolor", "~> 1.3" gem "terrapin", "~> 0.6.0" gem "thor", "~> 1.0" -gem "twilio-ruby", "~> 6.9.0" # Does not use semver after v5, watch out! +gem "twilio-ruby", "~> 7.2.0" # Does not use semver after v5, watch out! # JS/CSS gem "bootstrap", "~> 4.3" @@ -88,7 +88,7 @@ gem "acts_as_list" # Caching gem "actionpack-page_caching", "~> 1.1" -gem "bootsnap", "~> 1.4", require: false, group: [:production] +gem "bootsnap", "~> 1.4", require: false gem "dalli", "~> 3.2" # DB @@ -117,7 +117,7 @@ gem "sentry-ruby", "~> 5.0" gem "sentry-rails", "~> 5.0" # rubocop:disable Bundler/OrderedGems # Force Sprockets to stay on v3 for now. -gem "sprockets", "~> 3" +gem "sprockets" # The below are used for building load test plans. # Needed in prod because test plans are built on prod instances. @@ -177,7 +177,7 @@ group :development, :test do gem "assert_difference", "~> 1.0" # Deprecated: Barely used, convert usage to something else. gem "awesome_print", "~> 1.6" gem "db-query-matchers", "~> 0.10" - gem "rubocop", "1.22.3" # Hound supported versions: http://help.houndci.com/en/articles/2461415-supported-linters + gem "rubocop" gem "rubocop-rails", "~> 2.8" gem "rubocop-rake", "~> 0.6.0" gem "rubocop-rspec", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 606bc6c1d1..522ad2017a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,9 +191,6 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - capybara-screenshot (1.0.26) - capybara (>= 1.0, < 4) - launchy choice (0.2.0) chronic (0.10.2) chunky_png (1.4.0) @@ -216,12 +213,6 @@ GEM csv (3.3.0) daemons (1.4.1) dalli (3.2.8) - database_cleaner (2.0.2) - database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.1.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) date (3.3.4) db-query-matchers (0.12.0) activesupport (>= 4.0, < 7.2) @@ -339,6 +330,7 @@ GEM json (2.7.2) jwt (2.8.2) base64 + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) letter_opener (1.10.0) @@ -532,15 +524,17 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.22.3) + rubocop (1.64.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.12.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) + unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) rubocop-rails (2.15.2) @@ -599,13 +593,12 @@ GEM spreadsheet (1.3.1) bigdecimal ruby-ole - sprockets (3.7.3) - base64 + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.5.1) - actionpack (>= 6.1) - activesupport (>= 6.1) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) stringio (3.1.1) strscan (3.1.0) @@ -624,7 +617,7 @@ GEM tins (1.33.0) bigdecimal sync - twilio-ruby (6.9.1) + twilio-ruby (7.2.2) faraday (>= 0.9, < 3.0) jwt (>= 1.5, < 3.0) nokogiri (>= 1.6, < 2.0) @@ -695,13 +688,11 @@ DEPENDENCIES bullet (~> 7.1) cancancan (~> 3.1) capybara (~> 3.30) - capybara-screenshot (~> 1.0) clipboard-rails (~> 1.7) closure_tree! csv daemons (~> 1.2) dalli (~> 3.2) - database_cleaner (~> 2.0) db-query-matchers (~> 0.10) delayed_job_active_record (~> 4.1) descriptive_statistics (~> 2.5) @@ -758,7 +749,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec-github (~> 2.4) rspec-rails (~> 6.0) - rubocop (= 1.22.3) + rubocop rubocop-rails (~> 2.8) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.0) @@ -772,13 +763,13 @@ DEPENDENCIES sentry-ruby (~> 5.0) spinjs-rails (~> 1.3.0) spreadsheet - sprockets (~> 3) + sprockets sys-filesystem (~> 1.4) term-ansicolor (~> 1.3) terrapin (~> 0.6.0) thor (~> 1.0) timecop (= 0.9.6) - twilio-ruby (~> 6.9.0) + twilio-ruby (~> 7.2.0) uglifier (~> 4.2) vcr (~> 6.0) versionist (~> 2.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000000..22c80c75e3 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_tree ../../../vendor/assets +//= link application.js \ No newline at end of file