Merge branch 'master' into dependabot/npm_and_yarn/got-and-npm--removed

moneyadviceservice · Jan 23, 2024 · 20c22a0 · 20c22a0
2 parents 3c05428 + 5a58aff
commit 20c22a0
Show file tree

Hide file tree

Showing 11 changed files with 1,616 additions and 2,404 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,8 +24,6 @@ jobs:
           bundler-cache: true
       - name: Setup Node.js environment
         uses: actions/[email protected]
-        with:
-          node-version: 4.1.1
       - name: Install bower
         run: npm install -g bower
       - name: Install bowndler packages

diff --git a/Gemfile b/Gemfile
@@ -14,14 +14,14 @@ gem 'algoliasearch'
 gem 'autoprefixer-rails'
 gem 'bowndler', '~> 1.0'
 gem 'jbuilder', '~> 2.5'
-gem 'jquery-rails'
 gem 'meta-tags'
 gem 'newrelic_rpm'
 gem 'nokogiri'
 gem 'okcomputer'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'puma'
+gem 'rack-canonical-host'
 
 group :production do
   gem 'rails_12factor'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -145,10 +145,6 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
     json (1.8.6)
     kramdown (1.17.0)
     launchy (2.4.3)
@@ -182,7 +178,7 @@ GEM
     multipart-post (2.0.0)
     nap (1.1.0)
     newrelic_rpm (4.8.0.341)
-    nio4r (2.3.1)
+    nio4r (2.7.0)
     no_proxy_fix (0.1.2)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
@@ -202,10 +198,13 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     public_suffix (3.0.3)
-    puma (6.0.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.0.6)
+    rack-canonical-host (1.1.0)
+      addressable (> 0, < 3)
+      rack (>= 1.0.0, < 3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7.2)
@@ -345,7 +344,6 @@ DEPENDENCIES
   dotenv-rails
   dough-ruby (~> 5.28)!
   jbuilder (~> 2.5)
-  jquery-rails
   launchy
   listen (~> 3.0.5)
   mas-cms-client (= 1.18.0)!
@@ -355,6 +353,7 @@ DEPENDENCIES
   okcomputer
   pry-byebug
   puma
+  rack-canonical-host
   rails (~> 5.0.7)
   rails-controller-testing
   rails_12factor

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -12,7 +12,6 @@
 //
 //= require require_config
 //= require lib/modernizr-custom
-//= require jquery
 
 // Component Loader
 require(['jquery', 'componentLoader'], function ($, componentLoader) {

diff --git a/app/assets/javascripts/require_config.js.erb b/app/assets/javascripts/require_config.js.erb
@@ -19,6 +19,7 @@
       Rails.application.config.assets.prefix,
     paths: {
       # External dependancies
+      jquery: requirejs_path('jquery/dist/jquery'),
       eventsWithPromises: requirejs_path('eventsWithPromises/src/eventsWithPromises'),
       jqueryThrottleDebounce: requirejs_path('jqueryThrottleDebounce/jquery.ba-throttle-debounce'),
       rsvp: requirejs_path('rsvp/rsvp'),

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -22,6 +22,10 @@
     <!--[if ( !IE ) | ( gte IE 9 ) ]><!-->
       <%= render 'shared/svg/icon_sprite' %>
     <!--<![endif]-->
+
+    <% if ENV['NO_ROBOTS'] == 'true' %>
+    <meta name="robots" content="noindex">
+    <% end %>
   </head>
 
   <body>

diff --git a/bower.json.erb b/bower.json.erb
@@ -5,6 +5,7 @@
   "dependencies": {
     "dough": "<%= gem_path('dough-ruby') %>",
     "requirejs": "2.1.*",
-    "yeast": "1.12.0"
+    "yeast": "1.12.0",
+    "jquery": "3.3.*"
   }
 }
diff --git a/config.ru b/config.ru
@@ -1,5 +1,7 @@
 # This file is used by Rack-based servers to start the application.
+require 'rack/canonical_host'
 
 require_relative 'config/environment'
 
+use Rack::CanonicalHost, ENV['CANONICAL_HOST'] if ENV['CANONICAL_HOST']
 run Rails.application
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -40,7 +40,8 @@
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
+  config.ssl_options = { hsts: { preload: true } }
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.