From 05752dd2051dedcd7cfb7db1f0c6e3469f4f4728 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Mon, 12 Aug 2019 01:52:23 +0000
Subject: [PATCH 1/3] refactor: modernize holo config

---
 .holo/branches/emergence-site/_codeforphilly.toml | 2 +-
 .holo/branches/emergence-site/_laddr.toml         | 1 +
 .holo/sources/laddr.toml                          | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.holo/branches/emergence-site/_codeforphilly.toml b/.holo/branches/emergence-site/_codeforphilly.toml
index e9a07744..3897826f 100644
--- a/.holo/branches/emergence-site/_codeforphilly.toml
+++ b/.holo/branches/emergence-site/_codeforphilly.toml
@@ -1,3 +1,3 @@
 [holomapping]
 files = "*/**"
-after = [ "laddr" ]
+after = "*"
diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml
index 76c4570c..94db1844 100644
--- a/.holo/branches/emergence-site/_laddr.toml
+++ b/.holo/branches/emergence-site/_laddr.toml
@@ -1,2 +1,3 @@
 [holomapping]
 files = "*/**"
+before = "*"
diff --git a/.holo/sources/laddr.toml b/.holo/sources/laddr.toml
index 15f9e6fe..3ea9bec3 100644
--- a/.holo/sources/laddr.toml
+++ b/.holo/sources/laddr.toml
@@ -1,6 +1,3 @@
 [holosource]
 url = "https://github.com/CodeForPhilly/laddr"
-ref = "refs/heads/develop"
-
-[holosource.project]
-holobranch = "emergence-skeleton"
+ref = "refs/heads/emergence/skeleton/v3"

From 241bc17ef58804c673babd748db371c12f1166e0 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Sun, 7 Jul 2019 12:21:03 -0400
Subject: [PATCH 2/3] fix: strip down .studiorc lines

---
 .studiorc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.studiorc b/.studiorc
index eb04fee8..66daba17 100644
--- a/.studiorc
+++ b/.studiorc
@@ -1,9 +1,3 @@
 #!/bin/bash
-
 hab pkg install emergence/studio
 source "$(hab pkg path emergence/studio)/studio.sh"
-
-echo "    * Use 'load-into-mysql <files>' to load .sql.bz2 files into local mysql database"
-load-into-mysql() {
-    bzcat "$@" | hab pkg exec core/mysql mysql -u root -h 127.0.0.1 default
-}

From 671f491ad4ce26bdc14e462c4a7f41d8d3e989d4 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 20 Aug 2019 20:48:47 -0400
Subject: [PATCH 3/3] feat: enable newsletter opt-in/-out profile option

---
 .../Laddr/ProfileRequestHandler.config.d/newsletter.php       | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php

diff --git a/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php b/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php
new file mode 100644
index 00000000..aeed721e
--- /dev/null
+++ b/php-config/Laddr/ProfileRequestHandler.config.d/newsletter.php
@@ -0,0 +1,4 @@
+<?php
+
+// uncomment to enable newsletter opt-in/out option in user profiles
+Laddr\ProfileRequestHandler::$enableNewsletterOptIn = true;