Merge pull request #2789 from alphagov/extract-account-concern

alphagov · Jun 2, 2021 · 9db8301 · 9db8301
2 parents e4e4562 + 15e448b
commit 9db8301
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 57 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,7 @@ gem "dalli"
 gem "gds-api-adapters"
 gem "govuk_ab_testing"
 gem "govuk_app_config"
+gem "govuk_personalisation"
 gem "govuk_publishing_components"
 gem "htmlentities"
 gem "invalid_utf8_rejector"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -133,6 +133,8 @@ GEM
       sentry-raven (~> 3.1.1)
       statsd-ruby (~> 1.5.0)
       unicorn (>= 5.4, < 5.9)
+    govuk_personalisation (0.2.0)
+      rails (~> 6)
     govuk_publishing_components (24.11.1)
       govuk_app_config
       kramdown
@@ -430,6 +432,7 @@ DEPENDENCIES
   govuk-content-schema-test-helpers
   govuk_ab_testing
   govuk_app_config
+  govuk_personalisation
   govuk_publishing_components
   govuk_schemas
   govuk_test

diff --git a/app/controllers/concerns/account_concern.rb b/app/controllers/concerns/account_concern.rb
diff --git a/app/controllers/save_pages_controller.rb b/app/controllers/save_pages_controller.rb
@@ -1,5 +1,5 @@
 class SavePagesController < ApplicationController
-  include AccountConcern
+  include GovukPersonalisation::AccountConcern
 
   before_action :set_no_cache_headers
   before_action { head :not_found unless feature_flag_enabled? }

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-  include AccountConcern
+  include GovukPersonalisation::AccountConcern
 
   before_action :set_no_cache_headers