Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b3e0f2640905
Commit
f9eebd26
authored
Mar 06, 2018
by
Shinya Maeda
Browse files
Revert unnecessary code running_or_pending_build_count removal
parent
5988987b2c42
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/ci/build.rb
View file @
b3e0f264
...
...
@@ -359,6 +359,7 @@ def execute_hooks
project
.
execute_hooks
(
build_data
.
dup
,
:job_hooks
)
project
.
execute_services
(
build_data
.
dup
,
:job_hooks
)
PagesService
.
new
(
build_data
).
execute
project
.
running_or_pending_build_count
(
force:
true
)
end
def
artifacts_metadata_entry
(
path
,
**
options
)
...
...
app/models/project.rb
View file @
b3e0f264
...
...
@@ -1494,6 +1494,12 @@ def remove_import_jid
update_column
(
:import_jid
,
nil
)
end
def
running_or_pending_build_count
(
force:
false
)
Rails
.
cache
.
fetch
([
'projects'
,
id
,
'running_or_pending_build_count'
],
force:
force
)
do
builds
.
running_or_pending
.
count
(
:all
)
end
end
# Lazy loading of the `pipeline_status` attribute
def
pipeline_status
@pipeline_status
||=
Gitlab
::
Cache
::
Ci
::
ProjectPipelineStatus
.
load_for_project
(
self
)
...
...
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
b3e0f264
...
...
@@ -31,5 +31,7 @@
page
.
within
(
'.erased'
)
do
expect
(
page
).
to
have_content
(
'Job has been erased'
)
end
expect
(
build
.
project
.
running_or_pending_build_count
).
to
eq
(
build
.
project
.
builds
.
running_or_pending
.
count
(
:all
))
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