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
38ae3d0c
Commit
38ae3d0c
authored
Jan 20, 2017
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
d6a92bad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
...cation_settings/_shared_runners_minutes_setting.html.haml
+1
-1
app/views/projects/builds/_shared_runner_limit_warning.html.haml
...ws/projects/builds/_shared_runner_limit_warning.html.haml
+1
-1
spec/features/projects/builds_spec.rb
spec/features/projects/builds_spec.rb
+1
-1
No files found.
app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml
View file @
38ae3d0c
...
...
@@ -5,4 +5,4 @@
.help-block
Set the maximum number of build minutes that a group can use on shared Runners per month.
0 for unlimited.
=
link_to
con
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
=
link_to
i
con
(
'question-circle'
),
help_page_path
(
"user/admin_area/settings/continuous_integration"
,
anchor:
"shared-runners-build-minutes-quota"
),
target:
'_blank'
app/views/projects/builds/_shared_runner_limit_warning.html.haml
View file @
38ae3d0c
...
...
@@ -3,7 +3,7 @@
-
quota_limit
=
project
.
namespace
.
actual_shared_runners_minutes_limit
.bs-callout.bs-callout-warning
%p
You have used all your shared Runner
minutes
You have used all your shared Runner
s build minutes.
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
-
if
can?
(
current_user
,
:admin_build
,
@project
)
%br
...
...
spec/features/projects/builds_spec.rb
View file @
38ae3d0c
...
...
@@ -272,7 +272,7 @@ feature 'Builds', :feature do
it
'displays a warning message'
do
visit
namespace_project_build_path
(
project
.
namespace
,
project
,
build
)
expect
(
page
).
to
have_content
(
'You have used all your shared
runner minutes
'
)
expect
(
page
).
to
have_content
(
'You have used all your shared
Runners build minutes.
'
)
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