Merge branch 'main' into el/3157-document-updating-sandbox-credentials

docs/developer/adding-feature-flags.md

@@ -16,6 +16,14 @@ We use [django-waffle](https://waffle.readthedocs.io/en/stable/) for our feature
 4. (Important) Set the field `Everyone` to `Unknown`. This field overrides all other settings when set to anything else.
 5. Configure the settings as you see fit.
 
+## Enabling a feature flag with portfolio permissions
+1. Go to file `context_processors.py`
+2. Add feature flag name to the `porfolio_context` within the `portfolio_permissions` method. 
+3. For the conditional under `if portfolio`, add the feature flag name, and assign the appropiate permission that are in the `user.py` model.
+
+#### Note: 
+- If your use case includes non org, you want to add a feature flag outside of it, you can just update the portfolio context outside of the if statement.
+
 ## Using feature flags as boolean values
 Waffle [provides a boolean](https://waffle.readthedocs.io/en/stable/usage/views.html) called `flag_is_active` that you can use as you otherwise would a boolean. This boolean requires a request object and the flag name.
 

src/registrar/config/settings.py

@@ -824,7 +824,9 @@ SESSION_COOKIE_SAMESITE = "Lax"
 SESSION_COOKIE_SECURE = True
 
 # session engine to cache session information
-SESSION_ENGINE = "django.contrib.sessions.backends.cache"
+SESSION_ENGINE = "django.contrib.sessions.backends.db"
+
+SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
 
 # ~ Set by django.middleware.clickjacking.XFrameOptionsMiddleware
 # prevent clickjacking by instructing the browser not to load

src/registrar/management/commands/master_domain_migrations.py

@@ -29,9 +29,6 @@ logger = logging.getLogger(__name__)
 class Command(BaseCommand):
     help = """ """  # TODO: update this!
 
-    # ======================================================
-    # ==================    ARGUMENTS    ===================
-    # ======================================================
     def add_arguments(self, parser):
         """
         OPTIONAL ARGUMENTS: