Commit d3182f35 authored by Tim Zallmann's avatar Tim Zallmann

Changes based on MR to include configurable URL + fixes

parent ad6c1a9b
...@@ -75,7 +75,13 @@ module LicenseHelper ...@@ -75,7 +75,13 @@ module LicenseHelper
uri.to_s uri.to_s
end end
def show_promotions # Temporary URL for promotions - later `group_billings_path(group)` or `profile_billings_path`
def upgrade_plan_url
'https://about.gitlab.com/gitlab-com/'
end
# Temporary Switch
def show_promotions?
true true
end end
......
...@@ -181,6 +181,8 @@ ...@@ -181,6 +181,8 @@
.js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project), .js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project),
enabled: "#{@project.service_desk_enabled}", enabled: "#{@project.service_desk_enabled}",
incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } } incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } }
- elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
= render 'shared/promotions/promote_servicedesk'
= render 'export', project: @project = render 'export', project: @project
......
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
%a{ href: 'https://docs.gitlab.com/ee/user/project/service_desk.html', target: '_blank' } Read more %a{ href: 'https://docs.gitlab.com/ee/user/project/service_desk.html', target: '_blank' } Read more
- if current_user.admin? - if current_user.admin?
- if Gitlab.com? - if Gitlab.com?
= link_to 'Upgrade your plan', 'https://about.gitlab.com/gitlab-com/', class: 'btn btn-primary' = link_to 'Upgrade your plan', upgrade_plan_url, class: 'btn btn-primary'
- else - else
= link_to 'Start GtiLab Enterprise Edition trial', new_trial_url, class: 'btn btn-primary' = link_to 'Start GitLab Enterprise Edition trial', new_trial_url, class: 'btn btn-primary'
- else - else
%p %p
Contact your Administrator to upgrade your plan. - if Gitlab.com?
Contact your Administrator to upgrade your plan.
- else
Contact your Administrator to upgrade your license.
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