Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.129.0",
+  "version": "4.129.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.129.0",
+  "version": "4.129.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.7.7",

website/client/src/components/settings/subscription.vue

@@ -1,19 +1,5 @@
 <template>
   <div class="standard-page pt-0 px-0">
-    <div class="banner-g1g1 mx-n3 d-flex justify-content-center">
-      <div
-        class="svg-icon svg-gifts my-auto mr-5 ml-auto"
-        v-html="icons.giftsVertical">
-      </div>
-      <div class="my-auto text-center">
-        <strong> {{ $t('g1g1Announcement') }} </strong>
-        <div class="mt-1"> {{ $t('g1g1Details') }} </div>
-      </div>
-      <div
-        class="svg-icon svg-gifts gifts-right my-auto ml-5 mr-auto"
-        v-html="icons.giftsVertical">
-      </div>
-    </div>
     <h1>{{ $t('subscription') }}</h1>
     <div class="row">
       <div class="col-6">
@@ -262,25 +248,9 @@
     color: $white;
   }
 
-  .banner-g1g1 {
-    height: 5.75rem;
-    background-color: $teal-50;
-    color: $white;
-  }
-
-  .gifts-right {
-    filter: flipH;
-    transform: scaleX(-1);
-  }
-
   .subscribe-pay {
     margin-top: 1em;
   }
-
-  .svg-gifts {
-    width: 55px;
-    height: 65px;
-  }
 </style>
 
 <script>
@@ -297,7 +267,6 @@ import notificationsMixin from '../../mixins/notifications';
 
 import amazonButton from '@/components/payments/amazonButton';
 import creditCardIcon from '@/assets/svg/credit-card-icon.svg';
-import giftsVertical from '@/assets/svg/gifts-vertical.svg';
 
 export default {
   components: {
@@ -326,7 +295,6 @@ export default {
       },
       icons: Object.freeze({
         creditCardIcon,
-        giftsVertical,
       }),
     };
   },