diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-25 22:51:34 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-25 22:51:34 +0000 |
| commit | 73e8435110a941357e5cad223302bb0e34db8103 (patch) | |
| tree | dd955760819bb5e2839154005b45b1ddcc4748ae | |
| parent | 0139c221e41aee1bd021f08f8207df6ccac033b1 (diff) | |
| parent | 265aa433db2eb51f4f17886d5993a4b71976eaed (diff) | |
| download | gitlab-ce-73e8435110a941357e5cad223302bb0e34db8103.tar.gz | |
Merge branch 'existing-gcp-accounts' into 'master'
Add back copy for existing gcp accounts within offer banner
See merge request gitlab-org/gitlab-ce!20159
| -rw-r--r-- | app/views/projects/clusters/_gcp_signup_offer_banner.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/existing-gcp-accounts.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml b/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml index d0402197821..9298d93663d 100644 --- a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml +++ b/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml @@ -6,7 +6,7 @@ = image_tag 'illustrations/logos/google-cloud-platform_logo.svg' .col-sm-10 %h4= s_('ClusterIntegration|Redeem up to $500 in free credit for Google Cloud Platform') - %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link } + %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link } %a.btn.btn-info{ href: 'https://goo.gl/AaJzRW', target: '_blank', rel: 'noopener noreferrer' } Apply for credit diff --git a/changelogs/unreleased/existing-gcp-accounts.yml b/changelogs/unreleased/existing-gcp-accounts.yml new file mode 100644 index 00000000000..ce396c70b4a --- /dev/null +++ b/changelogs/unreleased/existing-gcp-accounts.yml @@ -0,0 +1,5 @@ +--- +title: Add back copy for existing gcp accounts within offer banner +merge_request: +author: +type: changed |