From 9f2f06578e4df0c4c87af7acc8885fefd9d8d9ed Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Sat, 12 Aug 2023 16:43:49 +0100 Subject: [PATCH 1/3] Disable unwanted Rubocop settings --- .rubocop.yml | 10 ++++++++++ .solargraph.yml | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .rubocop.yml diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 0000000..bcf2fb3 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,10 @@ +Naming/VariableNumber: + Enabled: false +Style/FrozenStringLiteralComment: + Enabled: false +Style/StringLiterals: + Enabled: false +Layout/LineLength: + Enabled: false +Style/StringConcatenation: + Enabled: false diff --git a/.solargraph.yml b/.solargraph.yml index 3973042..6573bd5 100644 --- a/.solargraph.yml +++ b/.solargraph.yml @@ -10,7 +10,6 @@ require: [] domains: [] reporters: - rubocop -- require_not_found formatter: rubocop: cops: safe From 8d03123a6a82f31eeac0a26dd6d7e122a702f4ce Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Sat, 12 Aug 2023 17:46:46 +0100 Subject: [PATCH 2/3] Add current scopes for time range models --- app/models/induction_period.rb | 2 ++ app/models/tenureship.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/induction_period.rb b/app/models/induction_period.rb index da731cc..9eb70a2 100644 --- a/app/models/induction_period.rb +++ b/app/models/induction_period.rb @@ -21,4 +21,6 @@ class InductionPeriod < ApplicationRecord belongs_to :mentorship belongs_to :appropriate_body belongs_to :induction_programme + + scope :current, -> { where(finished_on: nil) } end diff --git a/app/models/tenureship.rb b/app/models/tenureship.rb index 99d6d80..6cc4498 100644 --- a/app/models/tenureship.rb +++ b/app/models/tenureship.rb @@ -19,4 +19,6 @@ class Tenureship < ApplicationRecord belongs_to :teacher belongs_to :school has_many :mentorships + + scope :current, -> { where(finished_on: nil) } end From 29ad2eeecb53c0d191e35a683518a01ac238ea1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Aug 2023 16:56:58 +0000 Subject: [PATCH 3/3] Bump govuk-frontend from 4.4.1 to 4.7.0 Bumps [govuk-frontend](https://github.com/alphagov/govuk-frontend) from 4.4.1 to 4.7.0. - [Release notes](https://github.com/alphagov/govuk-frontend/releases) - [Changelog](https://github.com/alphagov/govuk-frontend/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk-frontend/compare/v4.4.1...v4.7.0) --- updated-dependencies: - dependency-name: govuk-frontend dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a238fbf..8fd2b2d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": "true", "dependencies": { "esbuild": "^0.19.0", - "govuk-frontend": "4.4.1", + "govuk-frontend": "4.7.0", "sass": "^1.65.1" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index d7c5964..8365aba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -194,10 +194,10 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -govuk-frontend@4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-4.4.1.tgz#88857c4ad8508255a4e983030a3964d6e1674107" - integrity sha512-Jm1LUWiH9vy47b6HSH/ksSb4ueBrtTTgyLBk+3X2qqAmmFUc1AXWLSYHid07YYu1tvn9RnodWk5Bac5Ywqk6tA== +govuk-frontend@4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-4.7.0.tgz#69950b6c2e69f435ffe9aa60d8dee232dac977de" + integrity sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg== immutable@^4.0.0: version "4.3.2"