Merge branch 'develop' into feature-disable-registration

ushahidi · Nov 25, 2020 · d0b4177 · d0b4177
2 parents 0144a35 + fe0aa7b
commit d0b4177
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -786,6 +786,60 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "Ifycode",
+      "name": "Obiagba Mary Ifeoma",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/45185388?v=4",
+      "profile": "https://medium.com/@obiagba.mary.ifeoma/understanding-regular-function-converting-to-arrow-function-3121446a663?source=friends_link&sk=2761da115a7f911084d34d3256815cbf",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bimbolabuari",
+      "name": "Abimbola Aminat Buari",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/66112760?v=4",
+      "profile": "https://github.com/bimbolabuari",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "OluyemisiA",
+      "name": "OluyemisiA",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/67320238?v=4",
+      "profile": "https://github.com/OluyemisiA",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bukolabisuga",
+      "name": "Bukola Bisuga",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/28568830?v=4",
+      "profile": "https://github.com/bukolabisuga",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "siggrid",
+      "name": "Natalia",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/52042098?v=4",
+      "profile": "https://github.com/siggrid",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Firenz",
+      "name": "Alicia G.",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2558299?v=4",
+      "profile": "https://github.com/Firenz",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "projectName": "platform",

diff --git a/.env.deploy b/.env.deploy
@@ -39,6 +39,8 @@ RS_REGION=""
 RS_CONTAINER=""
 TOS_RELEASE_DATE=
 
+CACHE_CONTROL_LEVEL=""
+
 PLATFORM_SHARED_SECRET=
 
 HDX_URL=

diff --git a/.github/workflows/test-and-ship.yml b/.github/workflows/test-and-ship.yml
@@ -64,8 +64,8 @@ jobs:
         # !!! composer 2.0 (now stable) clashes with lumen 5.5
         # installing our own composer as a stop-gap measure
         php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-        php -r "if (hash_file('sha384', 'composer-setup.php') === 'c31c1e292ad7be5f49291169c0ac8f683499edddcfd4e42232982d0fd193004208a58ff6f353fde0012d35fdd72bc394') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-        php composer-setup.php --install-dir=bin --version=1.10.16
+        php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+        php composer-setup.php --install-dir=bin --version=1.10.17
         php -r "unlink('composer-setup.php');"
         
         php bin/composer.phar install --no-interaction ;