From 1085068cb16938c46ba91d579a04c618b20039d1 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Thu, 5 Jan 2017 14:53:03 -0700
Subject: [PATCH] Clear github query params

---
 app/authenticated/controller.js | 6 ++++++
 scripts/utils.sh                | 2 +-
 translations/en-us.yaml         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/authenticated/controller.js b/app/authenticated/controller.js
index ec931ef66..ba434d9a2 100644
--- a/app/authenticated/controller.js
+++ b/app/authenticated/controller.js
@@ -13,6 +13,12 @@ export default Ember.Controller.extend({
 
   bootstrap: function() {
     Ember.run.schedule('afterRender', this, () => {
+      this.get('application').setProperties({
+        error: null,
+        error_description: null,
+        state: null,
+      });
+
       let bg = this.get(`prefs.${C.PREFS.BODY_BACKGROUND}`);
       if ( bg ) {
         $('BODY').css('background', bg);
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 4defb6bf7..f19d821e8 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -68,6 +68,6 @@ function gcs_upload_asset() {
   else
     runCmd gsutil -h "$cache_settings" -m cp -z "$gzip_settings" -R "${upload_source} ${upload_target}/${version}"
     sleep 5
-    runCmd gsutil -h "$cache_settings" -m rsync -C -c -r -d "${upload_source} ${upload_target}/${version}"
+    runCmd gsutil -h "$cache_settings" -m rsync -C -c -r -d "${upload_source}/ ${upload_target}/${version}"
   fi
 }
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index efe8684cc..1230bcd85 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -2489,7 +2489,7 @@ machine:
 
   driverDigitalocean:
     sizeLabel: |
-      {highMem, select, true {High Memory: } other {}}{memoryGb} RAM, {disk}gb Disk, {vcpus, plural,
+      {highMem, select, true {High Memory: } other {}}{memoryGb} GB RAM, {disk} GB Disk, {vcpus, plural,
         =1 {# vCPU}
         other {# vCPUs}
       }