Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d3182f35
Commit
d3182f35
authored
Aug 02, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes based on MR to include configurable URL + fixes
parent
ad6c1a9b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
app/helpers/license_helper.rb
app/helpers/license_helper.rb
+7
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-0
app/views/shared/promotions/_promote_servicedesk.html.haml
app/views/shared/promotions/_promote_servicedesk.html.haml
+6
-3
No files found.
app/helpers/license_helper.rb
View file @
d3182f35
...
...
@@ -75,7 +75,13 @@ module LicenseHelper
uri
.
to_s
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
end
...
...
app/views/projects/edit.html.haml
View file @
d3182f35
...
...
@@ -181,6 +181,8 @@
.js-service-desk-setting-root
{
data:
{
endpoint:
project_service_desk_path
(
@project
),
enabled:
"#{@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
...
...
app/views/shared/promotions/_promote_servicedesk.html.haml
View file @
d3182f35
...
...
@@ -15,9 +15,12 @@
%a
{
href:
'https://docs.gitlab.com/ee/user/project/service_desk.html'
,
target:
'_blank'
}
Read more
-
if
current_user
.
admin?
-
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
=
link_to
'Start G
ti
Lab Enterprise Edition trial'
,
new_trial_url
,
class:
'btn btn-primary'
=
link_to
'Start G
it
Lab Enterprise Edition trial'
,
new_trial_url
,
class:
'btn btn-primary'
-
else
%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.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment