Skip to content

Commit

Permalink
Bump redundancy calculator for Scottish bands
Browse files Browse the repository at this point in the history
  • Loading branch information
@benlovell
benlovell committed Jan 14, 2025
1 parent d013574 commit 7a4b836
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ gem 'dough-ruby', github: 'moneyadviceservice/dough', branch: 'PostMessages_v5.4
gem 'mas-cms-client', '1.20.1'
gem 'site_search', '0.3.0'
# Tools
gem 'action_plans', github: 'moneyadviceservice/action_plans', branch: 'scottish-links'
gem 'action_plans', github: 'moneyadviceservice/action_plans', ref: '071e3c3c'
gem 'advice_plans', '~> 4.1.1'
gem 'agreements', '~> 2.5.0'
gem 'budget_planner', github: 'moneyadviceservice/budget_planner', ref: '0efd1a9'
Expand Down
96 changes: 48 additions & 48 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ GIT

GIT
remote: https://github.com/moneyadviceservice/action_plans.git
revision: aaa09d75079b2bb8d19313b8da39c35bfa70ff60
branch: scottish-links
revision: 071e3c3c81b878a99e732ba7d27fb1b55a45d174
ref: 071e3c3c
specs:
action_plans (6.8.0)
autoprefixer-rails
Expand Down Expand Up @@ -146,21 +146,21 @@ GEM
remote: https://gems.railslts.com/
remote: https://gem.fury.io/h_app288206558/
specs:
actionmailer (4.2.11.37)
actionpack (= 4.2.11.37)
actionview (= 4.2.11.37)
activejob (= 4.2.11.37)
actionmailer (4.2.11.38)
actionpack (= 4.2.11.38)
actionview (= 4.2.11.38)
activejob (= 4.2.11.38)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11.37)
actionview (= 4.2.11.37)
activesupport (= 4.2.11.37)
actionpack (4.2.11.38)
actionview (= 4.2.11.38)
activesupport (= 4.2.11.38)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.11.37)
activesupport (= 4.2.11.37)
actionview (4.2.11.38)
activesupport (= 4.2.11.38)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
Expand All @@ -172,23 +172,23 @@ GEM
active_model_serializers (0.9.9)
activemodel (>= 3.2)
concurrent-ruby (~> 1.0)
activejob (4.2.11.37)
activesupport (= 4.2.11.37)
activejob (4.2.11.38)
activesupport (= 4.2.11.38)
globalid (>= 0.3.0)
activemodel (4.2.11.37)
activesupport (= 4.2.11.37)
activemodel (4.2.11.38)
activesupport (= 4.2.11.38)
builder (~> 3.1)
activerecord (4.2.11.37)
activemodel (= 4.2.11.37)
activesupport (= 4.2.11.37)
activerecord (4.2.11.38)
activemodel (= 4.2.11.38)
activesupport (= 4.2.11.38)
arel (~> 6.0)
activerecord-session_store (1.1.1)
actionpack (>= 4.0)
activerecord (>= 4.0)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
activesupport (4.2.11.37)
activesupport (4.2.11.38)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand Down Expand Up @@ -236,7 +236,7 @@ GEM
activesupport (>= 4.2)
bowndler (1.0.2)
thor
builder (3.2.4)
builder (3.3.0)
byebug (11.1.3)
capybara (2.18.0)
addressable
Expand All @@ -260,7 +260,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
crack (0.4.5)
rexml
crass (1.0.6)
Expand Down Expand Up @@ -301,7 +301,7 @@ GEM
responders
sass-rails
database_cleaner (1.6.2)
date (3.3.4)
date (3.4.1)
debt_advice_locator (4.2.1)
active_attr
active_model_serializers (< 0.10.0)
Expand Down Expand Up @@ -386,7 +386,7 @@ GEM
encryptor (3.0.0)
erubi (1.7.1)
erubis (2.7.0)
execjs (2.9.1)
execjs (2.10.0)
factory_bot (4.10.0)
activesupport (>= 3.0.0)
faker (1.8.7)
Expand Down Expand Up @@ -489,7 +489,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.22.0)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand Down Expand Up @@ -521,8 +521,8 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
mini_portile2 (2.8.8)
minitest (5.25.4)
modernizr-rails (2.6.3)
mortgage_calculator (4.6.0)
angularjs-rails (~> 1.2.18)
Expand All @@ -539,7 +539,7 @@ GEM
mysql2 (0.5.4)
net-http (0.3.2)
uri
net-imap (0.4.11)
net-imap (0.4.18)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -550,10 +550,10 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.0)
nokogiri (1.15.6)
nokogiri (1.15.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.6-x86_64-darwin)
nokogiri (1.15.7-x86_64-darwin)
racc (~> 1.4)
nunes (0.5.0)
opening_hours (0.0.7)
Expand Down Expand Up @@ -595,44 +595,44 @@ GEM
formtastic-bootstrap (>= 2.1, < 3)
friendly_id (>= 5.0)
rails (>= 4, < 5)
racc (1.8.0)
racc (1.8.1)
rack-accept (0.4.5)
rack (>= 0.4)
rack-livereload (0.3.17)
rack
rack-rewrite (1.5.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11.37)
actionmailer (= 4.2.11.37)
actionpack (= 4.2.11.37)
actionview (= 4.2.11.37)
activejob (= 4.2.11.37)
activemodel (= 4.2.11.37)
activerecord (= 4.2.11.37)
activesupport (= 4.2.11.37)
rails (4.2.11.38)
actionmailer (= 4.2.11.38)
actionpack (= 4.2.11.38)
actionview (= 4.2.11.38)
activejob (= 4.2.11.38)
activemodel (= 4.2.11.38)
activerecord (= 4.2.11.38)
activesupport (= 4.2.11.38)
bundler (>= 1.3.0)
railslts-version (= 4.2.11.37)
railties (= 4.2.11.37)
railslts-version (= 4.2.11.38)
railties (= 4.2.11.38)
sprockets-rails
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.6.0)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (~> 1.14)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railslts-version (4.2.11.37)
railties (4.2.11.37)
actionpack (= 4.2.11.37)
activesupport (= 4.2.11.37)
railslts-version (4.2.11.38)
railties (4.2.11.38)
actionpack (= 4.2.11.38)
activesupport (= 4.2.11.38)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
Expand All @@ -644,7 +644,7 @@ GEM
recaptcha (4.14.0)
json
redcarpet (3.2.3)
request_store (1.6.0)
request_store (1.7.0)
rack (>= 1.4)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
Expand Down Expand Up @@ -753,7 +753,7 @@ GEM
tidy-html5 (0.1.2)
tilt (1.4.1)
timecop (0.9.1)
timeout (0.4.1)
timeout (0.4.3)
transitions (0.1.13)
turnout (2.4.1)
i18n (~> 0.7)
Expand Down
4 changes: 2 additions & 2 deletions db/schema.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20181127152000) do
ActiveRecord::Schema.define(version: 20250107135912) do

create_table "action_plans_expense_items", force: :cascade do |t|
t.string "kind", limit: 256, null: false
Expand Down Expand Up @@ -50,7 +50,7 @@
t.string "package_salary_period", limit: 255
t.integer "package_duration_units", limit: 4
t.string "package_duration_period", limit: 255
t.boolean "northern_ireland"
t.integer "residence", limit: 4
end

create_table "action_plans_redundancy_tasks", force: :cascade do |t|
Expand Down

0 comments on commit 7a4b836

Please sign in to comment.