Merge pull request #365 from crossroads/master

[RELEASE] v0.18.6
crossroads · Apr 22, 2021 · 2d0feae · 2d0feae
2 parents 1e66a93 + 5d1725b
commit 2d0feae
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -234,7 +234,7 @@ jobs:
             echo 'export STAGING=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo false; else echo true; fi)' >> $BASH_ENV
             echo 'export ENVIRONMENT=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo production; else echo staging; fi)' >> $BASH_ENV
             echo 'export PROVISIONING_PROFILE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'GoodCityDonor.mobileprovision'; else echo 'GoodCityAppStaging.mobileprovision'; fi)' >> $BASH_ENV
-            echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'Goodcity_2020.p12'; else echo 'GoodCity_2020_Development.p12'; fi)' >> $BASH_ENV
+            echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'hk.goodcity.p12'; else echo 'hk.goodcity.dev.p12'; fi)' >> $BASH_ENV
       - run:
           command: |
               npm rebuild node-sass

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,16 +15,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.1.1)
-    aws-partitions (1.437.0)
-    aws-sdk-core (3.113.1)
+    aws-partitions (1.446.0)
+    aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.0)
+    aws-sdk-s3 (1.93.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -77,27 +77,30 @@ GEM
       highline (~> 1.7.2)
     concurrent-ruby (1.1.7)
     declarative (0.0.20)
-    declarative-option (0.1.0)
     digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.2)
     escape (0.0.4)
-    excon (0.79.0)
-    faraday (1.3.0)
+    excon (0.80.1)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.3)
-    fastlane (2.179.0)
+    fastlane (2.181.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       artifactory (~> 3.0)
@@ -156,7 +159,7 @@ GEM
       rexml
       signet (~> 0.14)
       webrick
-    google-apis-iamcredentials_v1 (0.2.0)
+    google-apis-iamcredentials_v1 (0.3.0)
       google-apis-core (~> 0.1)
     google-apis-storage_v1 (0.3.0)
       google-apis-core (~> 0.1)
@@ -174,7 +177,7 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.16.0)
+    googleauth (0.16.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -189,10 +192,10 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.5.1)
-    jwt (2.2.2)
+    jwt (2.2.3)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.0.3)
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     molinillo (0.6.6)
@@ -211,12 +214,12 @@ GEM
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.3)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rouge (2.0.7)
     ruby-macho (1.4.0)
     ruby2_keywords (0.0.4)
@@ -238,6 +241,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)

diff --git a/app/instance-initializers/ajax.js b/app/instance-initializers/ajax.js
@@ -0,0 +1,11 @@
+import AjaxPromise from "goodcity/utils/ajax-promise";
+
+export default {
+  name: "ajax",
+  initialize: function(app) {
+    const { container = app } = app;
+    const adapter = container.lookup("adapter:application");
+
+    AjaxPromise.setDefaultHeaders(() => adapter.get("headers"));
+  }
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "goodcity",
-  "version": "0.18.5",
+  "version": "0.18.6",
   "description": "Small description for goodcity goes here",
   "license": "MIT",
   "author": "",

diff --git a/yarn.lock b/yarn.lock
@@ -10310,7 +10310,7 @@ sha@~2.0.1:
 
 "shared-goodcity@git://github.com/crossroads/shared.goodcity.git#master":
   version "0.0.0"
-  resolved "git://github.com/crossroads/shared.goodcity.git#006c006783ac6a87ff2d26bcf4df3a81482f1508"
+  resolved "git://github.com/crossroads/shared.goodcity.git#43228165170745d2a6b9f057bba86e0ed53ebd46"
   dependencies:
     cryptiles "^4.1.2"
     ember-cli-babel "^5.1.6"