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
d6a92bad
Commit
d6a92bad
authored
Jan 20, 2017
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change links to build limits docs in app/views
parent
e5c9bf36
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
17 deletions
+22
-17
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
...cation_settings/_shared_runners_minutes_setting.html.haml
+2
-2
app/views/admin/groups/_shared_runner_status.html.haml
app/views/admin/groups/_shared_runner_status.html.haml
+1
-1
app/views/admin/projects/_shared_runner_status.html.haml
app/views/admin/projects/_shared_runner_status.html.haml
+2
-2
app/views/groups/_shared_runners_minutes_setting.html.haml
app/views/groups/_shared_runners_minutes_setting.html.haml
+3
-3
app/views/groups/pipeline_quota/index.html.haml
app/views/groups/pipeline_quota/index.html.haml
+9
-4
app/views/layouts/nav/_group_settings.html.haml
app/views/layouts/nav/_group_settings.html.haml
+2
-2
app/views/projects/builds/_shared_runner_limit_warning.html.haml
...ws/projects/builds/_shared_runner_limit_warning.html.haml
+2
-2
app/views/shared/_shared_runners_minutes_limit.html.haml
app/views/shared/_shared_runners_minutes_limit.html.haml
+1
-1
No files found.
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
View file @
d6a92bad
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
.col-sm-10
.col-sm-10
=
form
.
number_field
:shared_runners_minutes
,
class:
'form-control'
=
form
.
number_field
:shared_runners_minutes
,
class:
'form-control'
.help-block
.help-block
Set the maximum number of build minutes that a group can use on shared
r
unners per month.
Set the maximum number of build minutes that a group can use on shared
R
unners per month.
0 for unlimited.
0 for unlimited.
=
link_to
"(?)"
,
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-minutes"
)
=
link_to
con
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
app/views/admin/groups/_shared_runner_status.html.haml
View file @
d6a92bad
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
%span
.light
Build minutes quota:
%span
.light
Build minutes quota:
%strong
%strong
=
group_shared_runner_limits_quota
(
group
)
=
group_shared_runner_limits_quota
(
group
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-
minutes"
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-
build-minutes-quota"
),
target:
'_blank'
app/views/admin/projects/_shared_runner_status.html.haml
View file @
d6a92bad
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
Enabled
Enabled
-
if
project
.
shared_runners_minutes_limit_enabled?
-
if
project
.
shared_runners_minutes_limit_enabled?
-
limit
=
project
.
actual_shared_runners_minutes_limit
.
to_i
-
limit
=
project
.
actual_shared_runners_minutes_limit
.
to_i
(Limited to
#{
limit
}
minutes per month)
(Limited to
#{
limit
}
build
minutes per month)
-
else
-
else
(Unlimited minutes)
(Unlimited
build
minutes)
-
else
-
else
Disabled
Disabled
app/views/groups/_shared_runners_minutes_setting.html.haml
View file @
d6a92bad
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.col-sm-10
.col-sm-10
=
f
.
number_field
:shared_runners_minutes_limit
,
class:
'form-control'
,
min:
0
=
f
.
number_field
:shared_runners_minutes_limit
,
class:
'form-control'
,
min:
0
%span
.help-block
#shared_runners_minutes_limit_help_block
%span
.help-block
#shared_runners_minutes_limit_help_block
Set the maximum number of build minutes that a group can use on shared
r
unners per month.
Set the maximum number of build minutes that a group can use on shared
R
unners per month.
Set 0 for unlimited.
Set 0 for unlimited.
Set empty to inherit global setting of
#{
current_application_settings
.
shared_runners_minutes
}
.
Set empty to inherit
the
global setting of
#{
current_application_settings
.
shared_runners_minutes
}
.
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-
minutes"
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-
build-minutes-quota"
),
target:
'_blank'
app/views/groups/pipeline_quota/index.html.haml
View file @
d6a92bad
-
page_title
"Pipeline Quota"
-
page_title
"Pipelines quota"
%h3
.page-title
Group Pipeline Quota
%h3
.page-title
%p
.light
Monthly build minutes usage across shared runners for
#{
@group
.
name
}
Group pipelines quota
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
%p
.light
Monthly build minutes usage across shared Runners for the
%strong
#{
@group
.
name
}
group
.pipeline-quota.container-fluid
.pipeline-quota.container-fluid
.row
.row
...
@@ -11,7 +16,7 @@
...
@@ -11,7 +16,7 @@
Usage since
Usage since
=
last_reset
.
strftime
(
'%b %d, %Y'
)
=
last_reset
.
strftime
(
'%b %d, %Y'
)
-
else
-
else
Current
Period U
sage
Current
period u
sage
%div
%div
=
group_shared_runner_limits_quota
(
@group
)
=
group_shared_runner_limits_quota
(
@group
)
minutes
minutes
...
...
app/views/layouts/nav/_group_settings.html.haml
View file @
d6a92bad
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
Audit Events
Audit Events
-
if
@group
.
shared_runners_enabled?
&&
@group
.
shared_runners_minutes_limit_enabled?
-
if
@group
.
shared_runners_enabled?
&&
@group
.
shared_runners_minutes_limit_enabled?
=
nav_link
(
controller: :pipeline_quota
)
do
=
nav_link
(
controller: :pipeline_quota
)
do
=
link_to
group_pipeline_quota_path
(
@group
),
title:
"Pipeline
Q
uota"
do
=
link_to
group_pipeline_quota_path
(
@group
),
title:
"Pipeline
s q
uota"
do
%span
%span
Pipeline
Q
uota
Pipeline
s q
uota
%li
%li
=
link_to
'Edit Group'
,
edit_group_path
(
@group
)
=
link_to
'Edit Group'
,
edit_group_path
(
@group
)
app/views/projects/builds/_shared_runner_limit_warning.html.haml
View file @
d6a92bad
...
@@ -3,11 +3,11 @@
...
@@ -3,11 +3,11 @@
-
quota_limit
=
project
.
namespace
.
actual_shared_runners_minutes_limit
-
quota_limit
=
project
.
namespace
.
actual_shared_runners_minutes_limit
.bs-callout.bs-callout-warning
.bs-callout.bs-callout-warning
%p
%p
You have used all your shared
r
unner minutes
You have used all your shared
R
unner minutes
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
-
if
can?
(
current_user
,
:admin_build
,
@project
)
-
if
can?
(
current_user
,
:admin_build
,
@project
)
%br
%br
For more information, go to the
For more information, go to the
=
succeed
"."
do
=
succeed
"."
do
=
link_to
namespace_project_runners_path
(
project
.
namespace
,
project
)
do
=
link_to
namespace_project_runners_path
(
project
.
namespace
,
project
)
do
r
unners page
R
unners page
app/views/shared/_shared_runners_minutes_limit.html.haml
View file @
d6a92bad
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
cookies
[
:hide_shared_runner_quota_message
].
blank?
&&
has_limit
&&
namespace
.
shared_runners_minutes_used?
&&
can_see_status
-
if
cookies
[
:hide_shared_runner_quota_message
].
blank?
&&
has_limit
&&
namespace
.
shared_runners_minutes_used?
&&
can_see_status
.shared-runner-quota-message.alert.alert-warning.hidden-xs
{
data:
{
scope:
scope
}
}
.shared-runner-quota-message.alert.alert-warning.hidden-xs
{
data:
{
scope:
scope
}
}
=
namespace
.
name
=
namespace
.
name
has exceeded their build minutes quota. Pipelines will not run anymore on shared
r
unners.
has exceeded their build minutes quota. Pipelines will not run anymore on shared
R
unners.
.pull-right
.pull-right
=
link_to
'Remind later'
,
'#'
,
class:
'hide-shared-runner-limit-message alert-link'
=
link_to
'Remind later'
,
'#'
,
class:
'hide-shared-runner-limit-message alert-link'
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