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
e78ef27b
Commit
e78ef27b
authored
Aug 21, 2019
by
Vitaly Slobodin
Committed by
Douglas Barbosa Alexandre
Sep 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make support.gitlab.com constant (EE::CUSTOMER_SUPPORT_URL)
parent
99631f65
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
8 deletions
+9
-8
ee/app/views/ci_minutes_usage_mailer/notify.html.haml
ee/app/views/ci_minutes_usage_mailer/notify.html.haml
+1
-1
ee/app/views/ci_minutes_usage_mailer/notify.text.erb
ee/app/views/ci_minutes_usage_mailer/notify.text.erb
+1
-1
ee/app/views/ci_minutes_usage_mailer/notify_limit.html.haml
ee/app/views/ci_minutes_usage_mailer/notify_limit.html.haml
+1
-1
ee/app/views/ci_minutes_usage_mailer/notify_limit.text.erb
ee/app/views/ci_minutes_usage_mailer/notify_limit.text.erb
+1
-1
ee/app/views/groups/billings/index.html.haml
ee/app/views/groups/billings/index.html.haml
+1
-1
ee/app/views/shared/billings/_billing_plans.html.haml
ee/app/views/shared/billings/_billing_plans.html.haml
+1
-1
ee/lib/ee.rb
ee/lib/ee.rb
+1
-0
ee/spec/features/billings/billing_plans_spec.rb
ee/spec/features/billings/billing_plans_spec.rb
+2
-2
No files found.
ee/app/views/ci_minutes_usage_mailer/notify.html.haml
View file @
e78ef27b
...
...
@@ -3,4 +3,4 @@
%p
Click
#{
link_to
(
'here'
,
EE
::
SUBSCRIPTIONS_PLANS_URL
)
}
to purchase more minutes.
%p
If you need assistance, please contact
#{
link_to
(
'GitLab support'
,
'https://support.gitlab.com'
)
}
.
If you need assistance, please contact
#{
link_to
(
'GitLab support'
,
EE
::
CUSTOMER_SUPPORT_URL
)
}
.
ee/app/views/ci_minutes_usage_mailer/notify.text.erb
View file @
e78ef27b
...
...
@@ -2,4 +2,4 @@ This is an automated notification to let you know that your CI Runner Minutes qu
Please visit
<%=
EE
::
SUBSCRIPTIONS_PLANS_URL
%>
to purchase more minutes.
If you need assistance, please contact GitLab support (
https://support.gitlab.com
).
If you need assistance, please contact GitLab support (
<%=
EE
::
CUSTOMER_SUPPORT_URL
%>
).
ee/app/views/ci_minutes_usage_mailer/notify_limit.html.haml
View file @
e78ef27b
...
...
@@ -3,4 +3,4 @@
%p
Click
#{
link_to
(
'here'
,
EE
::
SUBSCRIPTIONS_PLANS_URL
)
}
to purchase more minutes.
%p
If you need assistance, please contact
#{
link_to
(
'GitLab support'
,
'https://support.gitlab.com'
)
}
.
If you need assistance, please contact
#{
link_to
(
'GitLab support'
,
EE
::
CUSTOMER_SUPPORT_URL
)
}
.
ee/app/views/ci_minutes_usage_mailer/notify_limit.text.erb
View file @
e78ef27b
...
...
@@ -3,4 +3,4 @@ quota for "<%= @namespace_name %>" is below <%= @percentage_of_available_mins %>
Please visit
<%=
EE
::
SUBSCRIPTIONS_PLANS_URL
%>
to purchase more minutes.
If you need assistance, please contact GitLab support (
https://support.gitlab.com
).
If you need assistance, please contact GitLab support (
<%=
EE
::
CUSTOMER_SUPPORT_URL
%>
).
ee/app/views/groups/billings/index.html.haml
View file @
e78ef27b
...
...
@@ -11,6 +11,6 @@
-
if
@group
.
actual_plan
.center
-
support_link
=
link_to
s_
(
"BillingPlans|Contact Support"
),
"https://support.gitlab.com"
-
support_link
=
link_to
s_
(
"BillingPlans|Contact Support"
),
EE
::
CUSTOMER_SUPPORT_URL
=
s_
(
"BillingPlans|If you would like to downgrade your plan please %{support_link}."
).
html_safe
%
{
support_link:
support_link
}
ee/app/views/shared/billings/_billing_plans.html.haml
View file @
e78ef27b
-
current_plan
=
subscription_plan_info
(
plans_data
,
namespace
.
actual_plan_name
)
-
support_link
=
link_to
s_
(
"BillingPlans|Contact Support"
),
"https://support.gitlab.com"
-
support_link
=
link_to
s_
(
"BillingPlans|Contact Support"
),
EE
::
CUSTOMER_SUPPORT_URL
-
if
current_plan
=
render
'shared/billings/billing_plan_header'
,
namespace:
namespace
,
plan:
current_plan
...
...
ee/lib/ee.rb
View file @
e78ef27b
...
...
@@ -4,4 +4,5 @@ module EE
SUBSCRIPTIONS_URL
=
'https://customers.gitlab.com'
.
freeze
SUBSCRIPTIONS_PLANS_URL
=
"
#{
SUBSCRIPTIONS_URL
}
/plans"
.
freeze
SUBSCRIPTIONS_MORE_MINUTES_URL
=
"
#{
SUBSCRIPTIONS_URL
}
/buy_pipeline_minutes"
.
freeze
CUSTOMER_SUPPORT_URL
=
'https://support.gitlab.com'
.
freeze
end
ee/spec/features/billings/billing_plans_spec.rb
View file @
e78ef27b
...
...
@@ -100,7 +100,7 @@ describe 'Billing plan pages', :feature do
page
.
within
(
'.content'
)
do
expect
(
page
).
to
have_link
(
'Upgrade plan'
,
href:
external_upgrade_url
(
namespace
,
bronze_plan
))
expect
(
page
).
to
have_content
(
'downgrade your plan'
)
expect
(
page
).
to
have_link
(
'Contact Support'
,
href:
'https://support.gitlab.com'
)
expect
(
page
).
to
have_link
(
'Contact Support'
,
href:
EE
::
CUSTOMER_SUPPORT_URL
)
end
end
end
...
...
@@ -126,7 +126,7 @@ describe 'Billing plan pages', :feature do
page
.
within
(
'.content'
)
do
expect
(
page
).
not_to
have_link
(
'Upgrade plan'
)
expect
(
page
).
to
have_content
(
'downgrade your plan'
)
expect
(
page
).
to
have_link
(
'Contact Support'
,
href:
'https://support.gitlab.com'
)
expect
(
page
).
to
have_link
(
'Contact Support'
,
href:
EE
::
CUSTOMER_SUPPORT_URL
)
end
end
end
...
...
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