Merge branch 'revert-f90fc922' into 'master'

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

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

1 files changed, 0 insertions, 23 deletions

diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 33c53021c11..463f4145bdd 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -21,29 +21,6 @@ module DashboardHelper
     links.any? { |link| dashboard_nav_link?(link) }
   end
 
-  def controller_action_to_child_dashboards(controller = controller_name, action = action_name)
-    case "#{controller}##{action}"
-    when 'projects#index', 'root#index', 'projects#starred', 'projects#trending'
-      %w(projects stars)
-    when 'dashboard#activity'
-      %w(starred_project_activity project_activity)
-    when 'groups#index'
-      %w(groups)
-    when 'todos#index'
-      %w(todos)
-    when 'dashboard#issues'
-      %w(issues)
-    when 'dashboard#merge_requests'
-      %w(merge_requests)
-    else
-      []
-    end
-  end
-
-  def user_default_dashboard?(user = current_user)
-    controller_action_to_child_dashboards.any? {|dashboard| dashboard == user.dashboard }
-  end
-
   private
 
   def get_dashboard_nav_links