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
9aee4203
Commit
9aee4203
authored
Apr 19, 2019
by
Rubén Dávila
Committed by
Douwe Maan
Apr 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show Buy Extra CI Minutes button when Group is on trial
parent
e272e7ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
11 deletions
+16
-11
ee/app/models/ee/namespace.rb
ee/app/models/ee/namespace.rb
+2
-0
ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml
...lines_quota/_extra_shared_runners_minutes_quota.html.haml
+1
-1
ee/spec/models/ee/namespace_spec.rb
ee/spec/models/ee/namespace_spec.rb
+10
-7
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
ee/app/models/ee/namespace.rb
View file @
9aee4203
...
...
@@ -285,6 +285,8 @@ module EE
end
def
paid_plan?
return
false
if
trial?
!
(
free_plan?
||
early_adopter_plan?
)
end
...
...
ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml
View file @
9aee4203
...
...
@@ -3,7 +3,7 @@
.row
.col-sm-6
%strong
=
_
(
"Aditional minutes"
)
=
_
(
"Ad
d
itional minutes"
)
%div
=
namespace_extra_shared_runner_limits_quota
(
namespace
)
minutes
...
...
ee/spec/models/ee/namespace_spec.rb
View file @
9aee4203
...
...
@@ -70,17 +70,20 @@ describe Namespace do
subject
{
namespace
.
paid_plan?
}
where
(
:plan_code
,
:expected_result
)
do
described_class
::
FREE_PLAN
|
false
described_class
::
EARLY_ADOPTER_PLAN
|
false
described_class
::
BRONZE_PLAN
|
true
described_class
::
SILVER_PLAN
|
true
described_class
::
GOLD_PLAN
|
true
where
(
:plan_code
,
:trial
,
:expected_result
)
do
described_class
::
FREE_PLAN
|
false
|
false
described_class
::
EARLY_ADOPTER_PLAN
|
false
|
false
described_class
::
BRONZE_PLAN
|
false
|
true
described_class
::
SILVER_PLAN
|
false
|
true
described_class
::
GOLD_PLAN
|
false
|
true
described_class
::
BRONZE_PLAN
|
true
|
false
described_class
::
SILVER_PLAN
|
true
|
false
described_class
::
GOLD_PLAN
|
true
|
false
end
with_them
do
before
do
namespace
.
update!
(
gitlab_subscription_attributes:
{
hosted_plan:
Plan
.
find_by_name
(
plan_code
)
})
namespace
.
update!
(
gitlab_subscription_attributes:
{
trial:
trial
,
hosted_plan:
Plan
.
find_by_name
(
plan_code
)
})
end
it
do
...
...
locale/gitlab.pot
View file @
9aee4203
...
...
@@ -683,6 +683,9 @@ msgstr ""
msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
msgstr ""
msgid "Additional minutes"
msgstr ""
msgid "Additional text"
msgstr ""
...
...
@@ -692,9 +695,6 @@ msgstr ""
msgid "Adds a todo."
msgstr ""
msgid "Aditional minutes"
msgstr ""
msgid "Admin Area"
msgstr ""
...
...
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