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
126a9c3c
Commit
126a9c3c
authored
Dec 20, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix view specs
parent
29d896f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+6
-5
app/workers/clear_shared_runners_minutes_worker.rb
app/workers/clear_shared_runners_minutes_worker.rb
+1
-1
spec/factories/groups.rb
spec/factories/groups.rb
+1
-1
No files found.
app/views/admin/projects/show.html.haml
View file @
126a9c3c
...
...
@@ -96,11 +96,12 @@
%strong
-
if
@project
.
shared_runners_enabled?
Enabled
-
if
@project
.
shared_runners_minutes_limit
.
nonzero?
=
@project
.
shared_runners_minutes_limit
total minutes
-
elsif
current_application_settings
.
shared_runners_minutes
Unlimited
-
if
@project
.
shared_runners_minutes_quota?
-
if
@project
.
shared_runners_minutes_limit_enabled?
=
@project
.
actual_shared_runners_minutes_limit
.
to_i
total minutes
-
else
Unlimited
-
else
Disabled
...
...
app/workers/clear_shared_runner_minutes_worker.rb
→
app/workers/clear_shared_runner
s
_minutes_worker.rb
View file @
126a9c3c
...
...
@@ -19,7 +19,7 @@ class ClearSharedRunnersMinutesWorker
private
def
try_obtain_lease
Gitlab
::
ExclusiveLease
.
new
(
'gitlab_clear_shared_runner_minutes_worker'
,
Gitlab
::
ExclusiveLease
.
new
(
'gitlab_clear_shared_runner
s
_minutes_worker'
,
timeout:
LEASE_TIMEOUT
).
try_obtain
end
end
spec/factories/groups.rb
View file @
126a9c3c
FactoryGirl
.
define
do
factory
:group
,
class:
Group
,
parent: :namespace
do
factory
:group
do
sequence
(
:name
)
{
|
n
|
"group
#{
n
}
"
}
path
{
name
.
downcase
.
gsub
(
/\s/
,
'_'
)
}
type
'Group'
...
...
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