Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 4ff25d021fb..ef0cb8b4bcb 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -95,6 +95,14 @@ module UsersHelper
     tabs
   end
 
+  def trials_link_url
+    'https://about.gitlab.com/free-trial/'
+  end
+
+  def trials_allowed?(user)
+    false
+  end
+
   def get_current_user_menu_items
     items = []
 
@@ -105,6 +113,7 @@ module UsersHelper
     items << :help
     items << :profile if can?(current_user, :read_user, current_user)
     items << :settings if can?(current_user, :update_user, current_user)
+    items << :start_trial if trials_allowed?(current_user)
 
     items
   end