Merge branch 'main' into bl/test-commit-signing

docs/developer/README.md

@@ -22,6 +22,24 @@ Visit the running application at [http://localhost:8080](http://localhost:8080).
 
 We use the branch convention of `initials/branch-topic` (ex: `lmm/fix-footer`). This allows for automated deployment to a developer sandbox namespaced to the initials.
 
+## Merging and PRs
+
+History preservation and merge contexts are more important to us than a clean and linear history, so we will merge instead of rebasing. 
+To bring your feature branch up-to-date wih main:
+
+```
+git checkout main
+git pull
+git checkout <feature-branch>
+git merge orgin/main
+git push
+```
+
+Resources:
+- [https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html](https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html)
+- [https://www.atlassian.com/git/tutorials/merging-vs-rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing)
+- [https://www.simplilearn.com/git-rebase-vs-merge-article](https://www.simplilearn.com/git-rebase-vs-merge-article)
+
 ## Setting Vars
 
 Non-secret environment variables for local development are set in [src/docker-compose.yml](../../src/docker-compose.yml).
@@ -41,6 +59,28 @@ cp ./.env-example .env
 
 Get the secrets from Cloud.gov by running `cf env getgov-YOURSANDBOX`. More information is available in [rotate_application_secrets.md](../operations/runbooks/rotate_application_secrets.md).
 
+## Adding user to /admin
+
+The endpoint /admin can be used to view and manage site content, including but not limited to user information and the list of current applications in the database. To be able to view and use /admin locally:
+
+1. Login via login.gov
+2. Go to the home page and make sure you can see the part where you can submit an application
+3. Go to /admin and it will tell you that UUID is not authorized, copy that UUID for use in 4
+4. in src/registrar/fixtures.py add to the ADMINS list in that file by adding your UUID as your username along with your first and last name. See below:
+
+```
+ ADMINS = [
+        {
+            "username": "<UUID here>",
+            "first_name": "",
+            "last_name": "",
+        },
+        ...
+ ]
+```
+
+5. In the browser, navigate to /admins. To verify that all is working correctly, under "domain applications" you should see fake domains with various fake statuses.
+
 ## Viewing Logs
 
 If you run via `docker-compose up`, you'll see the logs in your terminal.