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
3f4e9e38
Commit
3f4e9e38
authored
Jan 04, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move build page warning to a template partial to avoid conflicts
parent
ecb89438
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
app/views/projects/builds/_shared_runner_limit_warning.html.haml
...ws/projects/builds/_shared_runner_limit_warning.html.haml
+12
-0
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-12
No files found.
app/views/projects/builds/_shared_runner_limit_warning.html.haml
0 → 100644
View file @
3f4e9e38
-
if
project
.
namespace
.
shared_runners_minutes_used?
-
quota_used
=
project
.
namespace
.
shared_runners_minutes
-
quota_limit
=
project
.
namespace
.
actual_shared_runners_minutes_limit
.bs-callout.bs-callout-warning
%p
You have used all your shared runner minutes
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
%br
For more information, go to the
=
succeed
"."
do
=
link_to
namespace_project_runners_path
(
project
.
namespace
,
project
)
do
runners page
app/views/projects/builds/show.html.haml
View file @
3f4e9e38
...
...
@@ -26,18 +26,7 @@
=
link_to
namespace_project_runners_path
(
@build
.
project
.
namespace
,
@build
.
project
)
do
Runners page
-
if
@build
.
project
.
namespace
.
shared_runners_minutes_used?
-
quota_used
=
@build
.
project
.
namespace
.
shared_runners_minutes
-
quota_limit
=
@build
.
project
.
namespace
.
actual_shared_runners_minutes_limit
.bs-callout.bs-callout-warning
%p
You have used all your shared runner minutes
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
%br
For more information, go to the
=
succeed
"."
do
=
link_to
namespace_project_runners_path
(
@build
.
project
.
namespace
,
@build
.
project
)
do
runners page
=
render
"shared_runner_limit_warning"
,
project:
@build
.
project
-
if
@build
.
starts_environment?
.prepend-top-default
...
...
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