Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'

CE port Resolve "Promote starting a GitLab.com trial"

See merge request gitlab-org/gitlab-ce!21551

(cherry picked from commit f90fc922)

693e435f port EE
76980873 fix gcp signup offer close js class
f8e74da7 Review changes
1ea69589 Update user_has_namespace_with_gold? to check for any plan instead of just gold plan
76bc9eef Fix dismissable_callout import
8c4399e5 Lint
aee0abc8 Use initDismissableCallout for trial callout
2ab3e57c Update clusters/_banner
c58a4ea8 Lint
086549d9 fix cherry picking
05afd11e Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
ba2ad0f0 fix persistent_user_callout import
9f5a7e2d Update dismissable_callout.js to correct missing import path slash
45613341 Remove dismissable_callout as it has become an unneeded wrapper for persistent_user_callout
df3f369f Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' of…
1b16ef30 maintainer review

app/views/projects/clusters/_banner.html.haml

@@ -9,7 +9,7 @@
   = s_("ClusterIntegration|Kubernetes cluster was successfully created on Google Kubernetes Engine. Refresh the page to see Kubernetes cluster's details")
 - if show_cluster_security_warning?
-  .js-cluster-security-warning.alert.alert-block.alert-dismissable.bs-callout.bs-callout-warning
-    %button.close{ type: "button", data: { feature_id: UserCalloutsHelper::CLUSTER_SECURITY_WARNING, dismiss_endpoint: user_callouts_path } }  ×
+  .js-cluster-security-warning.alert.alert-block.alert-dismissable.bs-callout.bs-callout-warning{ data: { feature_id: UserCalloutsHelper::CLUSTER_SECURITY_WARNING, dismiss_endpoint: user_callouts_path } }
+    %button.close.js-close{ type: "button" }  ×
     = s_("ClusterIntegration|The default cluster configuration grants access to many functionalities needed to successfully build and deploy a containerised application.")
     = link_to s_("More information"),  help_page_path('user/project/clusters/index.md', anchor: 'security-implications')

app/views/projects/clusters/_gcp_signup_offer_banner.html.haml

 - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
-.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert' }
-  %button.close{ type: "button", data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }  ×
+.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
+  %button.close.js-close{ type: "button" }  ×
   .gcp-signup-offer--content
     .gcp-signup-offer--icon.append-right-8
       = sprite_icon("information", size: 16)