diff --git a/.circleci/config.yml b/.circleci/config.yml index cc507e92..c0eb0b3b 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -200,7 +200,7 @@ jobs: ios_build_and_deploy: macos: - xcode: "10.1.0" + xcode: "11.0.0" working_directory: ~/code shell: /bin/bash --login -eo pipefail environment: @@ -209,6 +209,19 @@ jobs: steps: - checkout + - run: + name: install node@6.16.0 + command: | + set +e + touch $BASH_ENV + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash + echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV + echo nvm install 6.16.0 >> $BASH_ENV + echo nvm alias default 6.16.0 >> $BASH_ENV + - run: + name: verify node version + command: node --version - restore-cache: *restore-ios-yarn-cache - run: *yarn - save-cache: *save-ios-yarn-cache @@ -301,7 +314,7 @@ jobs: www_deploy: <<: *defaults docker: - - image: circleci/ruby:2.5.1-node + - image: circleci/ruby:2.5.5 steps: - restore-cache: *restore-repo-cache - restore-cache: *restore-bundler-cache diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml new file mode 100644 index 00000000..9091a2c9 --- /dev/null +++ b/.github/workflows/release-notes.yml @@ -0,0 +1,27 @@ +# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Forward release notes + +on: + pull_request: + types: [closed] + branches: + - live + +jobs: + release-notes: + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 12.x + uses: actions/setup-node@v1 + with: + node-version: 12.x + - name: Generate and email notes + run: npx @goodcity/release-notes --email-to "prabier@crossroads.org.hk,swkenworthy@crossroads.org.hk,mdgow@crossroads.org.hk" --head ${{github.event.pull_request.head.sha}} --base ${{github.event.pull_request.base.sha}} --email-subject "🚀 Donor App Release 🚀" + env: + JIRA_USERNAME: ${{secrets.jira_username}} + JIRA_PASSWORD: ${{secrets.jira_password}} + SENDGRID_API_KEY: ${{secrets.sendgrid_api_key}} diff --git a/.ruby-version b/.ruby-version index d4bcea95..80d02f91 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.5.3 +ruby-2.5.5 diff --git a/Gemfile.lock b/Gemfile.lock index 902073a4..284ff9df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,7 +166,7 @@ GEM os (1.0.1) plist (3.5.0) public_suffix (2.0.5) - rake (12.3.1) + rake (12.3.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) diff --git a/bower.json b/bower.json index 63f5fbd9..a95d8822 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,8 @@ "ember-qunit-notifications": "0.1.0", "jquery-mockjax": "2.0.1", "active-model-adapter": "2.1.1", - "offline": "^0.7.19" + "offline": "^0.7.19", + "blueimp-load-image": "^5.12.0" }, "resolutions": { "jquery-placeholder": "~2.3.1", diff --git a/cordova/config.xml b/cordova/config.xml index 3440729e..b49f2054 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -87,7 +87,7 @@ - + diff --git a/ember-cli-build.js b/ember-cli-build.js index 9db276c1..519a29a6 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,12 +1,14 @@ /* global require, module */ -var EmberApp = require('ember-cli/lib/broccoli/ember-app'); -var webRelease = process.env.EMBER_CLI_CORDOVA === '0' && ['production', 'staging'].indexOf(process.env.EMBER_ENV) !== -1; +var EmberApp = require("ember-cli/lib/broccoli/ember-app"); +var webRelease = + process.env.EMBER_CLI_CORDOVA === "0" && + ["production", "staging"].indexOf(process.env.EMBER_ENV) !== -1; module.exports = function(defaults) { var app = new EmberApp(defaults, { sourcemaps: { enabled: true, - extensions: ['js'] + extensions: ["js"] }, minifyJS: { options: { @@ -14,32 +16,42 @@ module.exports = function(defaults) { } }, fingerprint: { - extensions: ['js','css', 'png', 'jpg', 'gif', 'map'], - exclude: ['images/donor.png'], + extensions: ["js", "css", "png", "jpg", "gif", "map"], + exclude: ["images/donor.png"], enabled: webRelease }, gzip: { keepUncompressed: true, - extensions: ['js', 'css', 'map', 'ttf', 'ott', 'eot', 'svg'], + extensions: ["js", "css", "map", "ttf", "ott", "eot", "svg"], enabled: webRelease } }); - app.import('bower_components/blueimp-file-upload/js/vendor/jquery.ui.widget.js'); - app.import('bower_components/blueimp-file-upload/js/jquery.iframe-transport.js'); - app.import('bower_components/blueimp-file-upload/js/jquery.fileupload.js'); - app.import('bower_components/cloudinary/js/load-image.min.js'); - app.import('bower_components/cloudinary/js/canvas-to-blob.min.js'); - app.import('bower_components/blueimp-file-upload/js/jquery.fileupload-process.js'); - app.import('bower_components/blueimp-file-upload/js/jquery.fileupload-image.js'); - app.import('bower_components/blueimp-file-upload/js/jquery.fileupload-validate.js'); - app.import('bower_components/cloudinary/js/jquery.cloudinary.js'); + app.import( + "bower_components/blueimp-file-upload/js/vendor/jquery.ui.widget.js" + ); + app.import( + "bower_components/blueimp-file-upload/js/jquery.iframe-transport.js" + ); + app.import("bower_components/blueimp-file-upload/js/jquery.fileupload.js"); + app.import("bower_components/blueimp-load-image/js/load-image.all.min.js"); + app.import("bower_components/cloudinary/js/canvas-to-blob.min.js"); + app.import( + "bower_components/blueimp-file-upload/js/jquery.fileupload-process.js" + ); + app.import( + "bower_components/blueimp-file-upload/js/jquery.fileupload-image.js" + ); + app.import( + "bower_components/blueimp-file-upload/js/jquery.fileupload-validate.js" + ); + app.import("bower_components/cloudinary/js/jquery.cloudinary.js"); - app.import('bower_components/moment/moment.js'); - app.import('bower_components/moment/locale/zh-tw.js'); - app.import('bower_components/pickadate/lib/picker.js'); - app.import('bower_components/pickadate/lib/picker.date.js'); - app.import('bower_components/pickadate/lib/picker.time.js'); + app.import("bower_components/moment/moment.js"); + app.import("bower_components/moment/locale/zh-tw.js"); + app.import("bower_components/pickadate/lib/picker.js"); + app.import("bower_components/pickadate/lib/picker.date.js"); + app.import("bower_components/pickadate/lib/picker.time.js"); app.import("bower_components/pickadate/lib/themes/default.css"); app.import("bower_components/pickadate/lib/themes/default.date.css"); @@ -47,23 +59,27 @@ module.exports = function(defaults) { // please include individual foundation js as needed // tabs js if included throws error on keypress when tab has focus - app.import('bower_components/foundation/js/foundation/foundation.js'); - app.import('bower_components/foundation/js/foundation/foundation.offcanvas.js'); - app.import('bower_components/foundation/js/foundation/foundation.reveal.js'); - app.import('bower_components/foundation/js/foundation/foundation.joyride.js'); - app.import('bower_components/foundation/js/foundation/foundation.topbar.js'); + app.import("bower_components/foundation/js/foundation/foundation.js"); + app.import( + "bower_components/foundation/js/foundation/foundation.offcanvas.js" + ); + app.import("bower_components/foundation/js/foundation/foundation.reveal.js"); + app.import("bower_components/foundation/js/foundation/foundation.joyride.js"); + app.import("bower_components/foundation/js/foundation/foundation.topbar.js"); // app.import('bower_components/fastclick/lib/fastclick.js'); - app.import('bower_components/jquery-placeholder/jquery.placeholder.js'); - app.import('bower_components/jquery.cookie/jquery.cookie.js'); - app.import('bower_components/modernizr/modernizr.js'); - app.import('bower_components/socket.io-client/socket.io.js'); - app.import('bower_components/braintree-web/dist/braintree.js'); + app.import("bower_components/jquery-placeholder/jquery.placeholder.js"); + app.import("bower_components/jquery.cookie/jquery.cookie.js"); + app.import("bower_components/modernizr/modernizr.js"); + app.import("bower_components/socket.io-client/socket.io.js"); + app.import("bower_components/braintree-web/dist/braintree.js"); - app.import('bower_components/lightgallery/light-gallery/css/lightGallery.css'); - app.import('bower_components/lightgallery/light-gallery/js/lightGallery.js'); - app.import('bower_components/lightgallery/light-gallery/img/loading.gif', { - destDir: '/img' + app.import( + "bower_components/lightgallery/light-gallery/css/lightGallery.css" + ); + app.import("bower_components/lightgallery/light-gallery/js/lightGallery.js"); + app.import("bower_components/lightgallery/light-gallery/img/loading.gif", { + destDir: "/img" }); return app.toTree(); diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6cb42ab7..0ec122ae 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,5 +1,15 @@ default_platform :ios +class FastlaneCore::Shell + def error(message) + UI.user_error!(message) + end +end + +def xsh(cmd) + sh cmd, error_callback: -> (err) { UI.user_error!(err) } +end + platform :ios do before_all do @@ -23,7 +33,7 @@ platform :ios do keychain_password: ENV['KEYCHAIN_PWD'] ) unlock_keychain(path:"default_keychain", password:ENV['KEYCHAIN_PWD']) - sh "security set-keychain-settings -t 3600 -l ~/Library/Keychains/default_keychain-db" + xsh "security set-keychain-settings -t 3600 -l ~/Library/Keychains/default_keychain-db" end desc "Generate staging build (just upload to TestFairy)" @@ -36,7 +46,7 @@ platform :ios do lane :production do raise_if_no_env_var(["APP_VERSION", "PILOT_USERNAME", "PILOT_IPA", "PILOT_TESTER_EMAIL", "ITUNESCONNECT_PASSWORD"]) version_number = ENV["APP_VERSION"] - sh %{ source ~/.circlerc; bundle exec fastlane fastlane-credentials add --username $PILOT_USERNAME --password $ITUNESCONNECT_PASSWORD } + xsh %{ source ~/.circlerc; bundle exec fastlane fastlane-credentials add --username $PILOT_USERNAME --password $ITUNESCONNECT_PASSWORD } latest_testflight_build_number(version: version_number, username: ENV['PILOT_USERNAME']) pilot deliver( @@ -51,7 +61,7 @@ platform :ios do after_all do # remove credentials from keychain - sh %{ source ~/.circlerc; bundle exec fastlane fastlane-credentials remove --username $PILOT_USERNAME } + xsh %{ source ~/.circlerc; bundle exec fastlane fastlane-credentials remove --username $PILOT_USERNAME } end error do |lane, exception| diff --git a/package.json b/package.json index a52ca00a..3fc2ec88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.17.7", + "version": "0.17.8", "description": "Small description for goodcity goes here", "license": "MIT", "author": "", diff --git a/tests/acceptance/edit-item-test.js b/tests/acceptance/edit-item-test.js index e936619c..04817a0a 100644 --- a/tests/acceptance/edit-item-test.js +++ b/tests/acceptance/edit-item-test.js @@ -1,29 +1,33 @@ -import Ember from 'ember'; -import startApp from '../helpers/start-app'; +import Ember from "ember"; +import startApp from "../helpers/start-app"; //import syncDataStub from '../helpers/empty-sync-data-stub'; -import FactoryGuy from 'ember-data-factory-guy'; -import TestHelper from 'ember-data-factory-guy/factory-guy-test-helper'; +import FactoryGuy from "ember-data-factory-guy"; +import TestHelper from "ember-data-factory-guy/factory-guy-test-helper"; var App, offer, offer1, item, item1; -module('Edit Item', { +module("Edit Item", { beforeEach: function() { App = startApp(); TestHelper.setup(App); //syncDataStub(TestHelper); offer = FactoryGuy.make("offer", { state: "draft" }); - item = FactoryGuy.make("item",{ offer:offer, state: "draft" }); + item = FactoryGuy.make("item", { offer: offer, state: "draft" }); offer1 = FactoryGuy.make("offer", { state: "draft" }); - item1 = FactoryGuy.make("item",{ offer:offer1, state: "submitted", - donorDescription: "this is a test Item"}); - FactoryGuy.makeList("donor_condition", 2); + item1 = FactoryGuy.make("item", { + offer: offer1, + state: "submitted", + donorDescription: "this is a test Item" + }); }, afterEach: function() { - Em.run(function() { TestHelper.teardown(); }); - Ember.run(App, 'destroy'); + Em.run(function() { + TestHelper.teardown(); + }); + Ember.run(App, "destroy"); } }); @@ -38,10 +42,15 @@ test("Create Item with details", function(assert) { }); fillIn("textarea[name=donorDescription]", "this is test item"); - click(":radio[value=1]"); + $(".item-details .radio-buttons li") + .first() + .click(); andThen(function() { - assert.equal(find("textarea[name=donorDescription]").val(), "this is test item"); + assert.equal( + find("textarea[name=donorDescription]").val(), + "this is test item" + ); }); // TestHelper.handleUpdate("item", item.id); @@ -67,9 +76,9 @@ test("Discard Item with details", function() { TestHelper.handleDelete("item", item.id); click(".button:contains('Cancel')"); - andThen(function(){ - equal(currentURL(), "/offers/"+ offer.id); - equal($('.item-content li').length, 0); + andThen(function() { + equal(currentURL(), "/offers/" + offer.id); + equal($(".item-content li").length, 0); }); }); @@ -85,8 +94,8 @@ test("Discard changes for existing Item", function() { click(".button:contains('Cancel')"); - andThen(function(){ - equal(currentURL(), "/offers/"+ offer1.id +"/offer_details"); - equal($('.item-content li:eq(0) .ellipsis').text(), "this is a test Item"); + andThen(function() { + equal(currentURL(), "/offers/" + offer1.id + "/offer_details"); + equal($(".item-content li:eq(0) .ellipsis").text(), "this is a test Item"); }); }); diff --git a/tests/factories/donor_condition.js b/tests/factories/donor_condition.js index 193a7a2e..952b2c83 100644 --- a/tests/factories/donor_condition.js +++ b/tests/factories/donor_condition.js @@ -1,12 +1,13 @@ -import FactoryGuy from 'ember-data-factory-guy'; +import FactoryGuy from "ember-data-factory-guy"; var conditions = ["New", "Lightly Used", "Heavily Used", "Broken"]; -FactoryGuy.define('donor_condition', { +FactoryGuy.define("donor_condition", { default: { name: FactoryGuy.generate(function(num) { return conditions[num] + num; - }) + }), + visibleToDonor: true } }); diff --git a/yarn.lock b/yarn.lock index 6387c1a0..0c9b188c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -70,11 +70,16 @@ acorn-walk@^6.1.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc" integrity sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg== -acorn@^5.0.0, acorn@^5.2.1: +acorn@^5.0.0: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== +acorn@^5.2.1: + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== + acorn@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4" @@ -1364,9 +1369,9 @@ big-integer@^1.6.7: integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== "binaryextensions@1 || 2": - version "2.2.0" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311" - integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22" + integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg== bl@~1.1.2: version "1.1.2" @@ -5590,9 +5595,9 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.1.9, graceful-fs@~4.1.6: integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -6330,11 +6335,9 @@ is-extglob@^2.1.1: integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== is-fullwidth-code-point@^1.0.0: version "1.0.0" @@ -7903,7 +7906,12 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -7936,7 +7944,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -7948,6 +7956,13 @@ mkdirp@^0.3.5: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" integrity sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc= +mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + mkdirp@~0.4.0: version "0.4.2" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.4.2.tgz#427c8c18ece398b932f6f666f4e1e5b7740e78c8" @@ -10017,9 +10032,9 @@ resolve@^0.6.3: integrity sha1-3ZV5gufnNt699TtYpN2RdUV13UY= resolve@^1.1.2, resolve@^1.1.6, resolve@^1.10.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" - integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== dependencies: path-parse "^1.0.6" @@ -10394,7 +10409,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#ba83c21b6427c57521c517655eba47353b45f782" + resolved "git://github.com/crossroads/shared.goodcity.git#ad886852451a4dee6657e300373a94b7c0c70c08" dependencies: cryptiles "^4.1.2" ember-cli-babel "^5.1.6" @@ -11123,9 +11138,9 @@ symbol-observable@^1.1.0: integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8: - version "1.3.0" - resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.0.tgz#a034398f11408ef083f51e0f7433040b6123ebf0" - integrity sha512-czheMn4hgCWK/nxqtm9On5JgUrl5KBPCdXYWZjvwiRQ4NA7XhdHY2GSASxQoVh+mbXPMoGcR7/MnngLtUZij4Q== + version "1.3.1" + resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe" + integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA== symlink-or-copy@^1.2.0: version "1.2.0"