Commit 9372a6ca authored by Sean McGivern's avatar Sean McGivern

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
parents e61cce36 4424a30f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity") = 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" - page_title "Activity"
- header_title "Activity", activity_dashboard_path - header_title "Activity", activity_dashboard_path
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title "Groups" - page_title "Groups"
- header_title "Groups", dashboard_groups_path - header_title "Groups", dashboard_groups_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
= render 'dashboard/groups_head' = render 'dashboard/groups_head'
- if params[:filter].blank? && @groups.empty? - if params[:filter].blank? && @groups.empty?
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues") = 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 .page-title-holder
%h1.page-title= _('Issues') %h1.page-title= _('Issues')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Merge Requests") - page_title _("Merge Requests")
- @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username) - @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 .page-title-holder
%h1.page-title= _('Merge Requests') %h1.page-title= _('Merge Requests')
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, dashboard_projects_url(rss_url_options), title: "All activity") = 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" - page_title "Projects"
- header_title "Projects", dashboard_projects_path - header_title "Projects", dashboard_projects_path
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- page_title _("Starred Projects") - page_title _("Starred Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
%div{ class: container_class } %div{ class: container_class }
= render "projects/last_push" = render "projects/last_push"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title "Todos" - page_title "Todos"
- header_title "Todos", dashboard_todos_path - header_title "Todos", dashboard_todos_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
.page-title-holder .page-title-holder
%h1.page-title= _('Todos') %h1.page-title= _('Todos')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Groups") - page_title _("Groups")
- header_title _("Groups"), dashboard_groups_path - header_title _("Groups"), dashboard_groups_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
- if current_user - if current_user
= render 'dashboard/groups_head' = render 'dashboard/groups_head'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title _("Projects") - page_title _("Projects")
- header_title _("Projects"), dashboard_projects_path - header_title _("Projects"), dashboard_projects_path
= render_if_exists "shared/gold_trial_callout" = render_dashboard_gold_trial(current_user)
- if current_user - if current_user
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment