Merge pull request #206 from CodeForPhilly/develop

Release: laddr v3.0.0-beta.4
CodeForPhilly · Aug 12, 2019 · 0e63801 · 0e63801
2 parents 856db4b + 608f29a
commit 0e63801
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 74 deletions.
diff --git a/.holo/branches/emergence-layer/_emergence-github.toml b/.holo/branches/emergence-layer/_emergence-github.toml
diff --git a/.holo/branches/emergence-layer/_emergence-redirects.toml b/.holo/branches/emergence-layer/_emergence-redirects.toml
diff --git a/.holo/branches/emergence-layer/_emergence-saml2.toml b/.holo/branches/emergence-layer/_emergence-saml2.toml
diff --git a/.holo/branches/emergence-layer/_emergence-slack.toml b/.holo/branches/emergence-layer/_emergence-slack.toml
diff --git a/.holo/branches/emergence-layer/_laddr.toml b/.holo/branches/emergence-layer/_laddr.toml
diff --git a/.holo/branches/emergence-layer/site-root/css/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-layer/site-root/css/lib/_bootstrap-combobox.toml
diff --git a/.holo/branches/emergence-layer/site-root/css/lib/_select2.toml b/.holo/branches/emergence-layer/site-root/css/lib/_select2.toml
diff --git a/.holo/branches/emergence-layer/site-root/js/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-layer/site-root/js/lib/_bootstrap-combobox.toml
diff --git a/.holo/branches/emergence-layer/site-root/js/lib/_select2.toml b/.holo/branches/emergence-layer/site-root/js/lib/_select2.toml
diff --git a/.holo/branches/emergence-site/_emergence-github.toml b/.holo/branches/emergence-site/_emergence-github.toml
@@ -3,5 +3,4 @@ files = [
     "*/**",
     "!php-config/Git.config.d/"
 ]
-after = "skeleton-v2"
 before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-redirects.toml b/.holo/branches/emergence-site/_emergence-redirects.toml
@@ -3,5 +3,4 @@ files = [
     "*/**",
     "!php-config/Git.config.d/"
 ]
-after = "skeleton-v2"
 before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-saml2.toml b/.holo/branches/emergence-site/_emergence-saml2.toml
@@ -3,5 +3,4 @@ files = [
     "*/**",
     "!php-config/Git.config.d/"
 ]
-after = "skeleton-v2"
 before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-slack.toml b/.holo/branches/emergence-site/_emergence-slack.toml
@@ -3,5 +3,4 @@ files = [
     "*/**",
     "!php-config/Git.config.d/"
 ]
-after = "skeleton-v2"
 before = "laddr"
diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml
@@ -4,4 +4,4 @@ files = [
     "!.vscode/",
     "!docs/"
 ]
-after = "skeleton-v2"
+after = "*"
diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -3,3 +3,4 @@ files = [
     "*/**",
     "!php-config/Git.config.d/"
 ]
+before = "*"
diff --git a/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml
@@ -2,5 +2,4 @@
 root = "css"
 files = [
     "bootstrap-combobox.css"
-]
-after = [ "skeleton-v2" ]
+]
diff --git a/.holo/branches/emergence-site/site-root/css/lib/_select2.toml b/.holo/branches/emergence-site/site-root/css/lib/_select2.toml
@@ -3,4 +3,3 @@ root = "dist/css"
 files = [
     "select2.css"
 ]
-after = [ "skeleton-v2" ]
diff --git a/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml b/.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml
@@ -2,5 +2,4 @@
 root = "js"
 files = [
     "bootstrap-combobox.js"
-]
-after = [ "skeleton-v2" ]
+]
diff --git a/.holo/branches/emergence-site/site-root/js/lib/_select2.toml b/.holo/branches/emergence-site/site-root/js/lib/_select2.toml
@@ -3,4 +3,3 @@ root = "dist/js"
 files = [
     "select2.js"
 ]
-after = [ "skeleton-v2" ]
diff --git a/.holo/branches/example-codeforphilly/_codeforphilly.toml b/.holo/branches/example-codeforphilly/_codeforphilly.toml
diff --git a/.holo/branches/example-codeforphilly/_laddr.toml b/.holo/branches/example-codeforphilly/_laddr.toml
diff --git a/.holo/sources/-skeleton.toml b/.holo/sources/-skeleton.toml
diff --git a/.holo/sources/codeforphilly.toml b/.holo/sources/codeforphilly.toml
diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
@@ -1,3 +1,3 @@
 [holosource]
 url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
-ref = "refs/heads/emergence/skeleton"
+ref = "refs/heads/emergence/skeleton/v2"
diff --git a/.studiorc b/.studiorc
@@ -1,4 +1,3 @@
 #!/bin/bash
-
 hab pkg install emergence/studio
 source "$(hab pkg path emergence/studio)/studio.sh"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ files = [ @@
         "*/**",
         "!php-config/Git.config.d/"
     ]
+    before = "*"