Merge pull request #2695 from bitzesty/production

Production/main sync
bitzesty · Nov 30, 2023 · 212c8cb · 212c8cb
2 parents 5794360 + a0002c3
commit 212c8cb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
@@ -2220,4 +2220,4 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .alert button.close {
   font-size: pxToRem(18);
-}
+}
diff --git a/app/assets/stylesheets/admin/forms.scss b/app/assets/stylesheets/admin/forms.scss
@@ -23,3 +23,13 @@ input.form-control, select.form-control,
 .input-group-addon {
   height: 2.42em !important;
 }
+
+input.form-control, select.form-control,
+.input-group-addon, textarea,
+.btn-default {
+  border-color: #5C5C5C !important;
+}
+
+.input-group-addon {
+  height: 2.42em !important;
+}
diff --git a/app/javascript/controllers/appraisal_form_controller.js b/app/javascript/controllers/appraisal_form_controller.js
@@ -101,7 +101,6 @@ export default class extends ApplicationController {
     wrapper.classList.remove('form-edit');
 
     if (Array.from(wrapper.querySelectorAll('.form-value p[data-for]')).length > 0) {
-      console.log(1);
       Array.from(wrapper.querySelectorAll('.form-value p[data-for]')).forEach((el) => {
         let identifier = el.dataset.for;
         let element = document.querySelector(`#${identifier}`);

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -161,7 +161,7 @@ def new_member?
   end
 
   def timeout_in
-    (ENV["SESSION_TIMEOUT"] || 20).to_f.hours
+    ENV.fetch("SESSION_TIMEOUT", 24).to_i.hours
   end
 
   def check_email_on_bounces!