Merge branch 'ce-billings-gold-trial-callout-fe-dashboard' into 'master'

CE FE Refactor dashboard gold trial callouts

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

app/views/dashboard/activity.html.haml

@@ -5,7 +5,7 @@
   = auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity")
 
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - page_title    "Activity"
 - header_title  "Activity", activity_dashboard_path

app/views/dashboard/groups/index.html.haml

@@ -2,7 +2,7 @@
 - page_title "Groups"
 - header_title "Groups", dashboard_groups_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 = render 'dashboard/groups_head'
 
 - if params[:filter].blank? && @groups.empty?

app/views/dashboard/issues.html.haml

@@ -4,7 +4,7 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues")
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 .page-title-holder
   %h1.page-title= _('Issues')

app/views/dashboard/merge_requests.html.haml

@@ -2,7 +2,7 @@
 - page_title _("Merge Requests")
 - @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username)
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 .page-title-holder
   %h1.page-title= _('Merge Requests')

app/views/dashboard/projects/index.html.haml

@@ -4,7 +4,7 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity")
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - page_title    "Projects"
 - header_title  "Projects", dashboard_projects_path

app/views/dashboard/projects/starred.html.haml

@@ -4,7 +4,7 @@
 - page_title _("Starred Projects")
 - header_title _("Projects"), dashboard_projects_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 %div{ class: container_class }
   = render "projects/last_push"

app/views/dashboard/todos/index.html.haml

@@ -2,7 +2,7 @@
 - page_title "Todos"
 - header_title "Todos", dashboard_todos_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 .page-title-holder
   %h1.page-title= _('Todos')

app/views/explore/groups/index.html.haml

@@ -2,7 +2,7 @@
 - page_title    _("Groups")
 - header_title  _("Groups"), dashboard_groups_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - if current_user
   = render 'dashboard/groups_head'

app/views/explore/projects/index.html.haml

@@ -2,7 +2,7 @@
 - page_title    _("Projects")
 - header_title  _("Projects"), dashboard_projects_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - if current_user
   = render 'dashboard/projects_head'

app/views/explore/projects/starred.html.haml

@@ -2,7 +2,7 @@
 - page_title    _("Projects")
 - header_title  _("Projects"), dashboard_projects_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - if current_user
   = render 'dashboard/projects_head'

app/views/explore/projects/trending.html.haml

@@ -2,7 +2,7 @@
 - page_title    _("Projects")
 - header_title  _("Projects"), dashboard_projects_path
 
-= render_if_exists "shared/gold_trial_callout"
+= render_dashboard_gold_trial(current_user)
 
 - if current_user
   = render 'dashboard/projects_head'