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
02072e17
Commit
02072e17
authored
Apr 03, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`
parent
a6d31300
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
lib/gitlab/cache/ci/project_pipeline_status.rb
lib/gitlab/cache/ci/project_pipeline_status.rb
+1
-1
spec/helpers/ci_status_helper_spec.rb
spec/helpers/ci_status_helper_spec.rb
+1
-1
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
+1
-1
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/ci/pipeline.rb
View file @
02072e17
...
@@ -393,7 +393,7 @@ module Ci
...
@@ -393,7 +393,7 @@ module Ci
end
end
def
refresh_project_build_status_cache
def
refresh_project_build_status_cache
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
.
update_for_pipeline
(
self
)
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
.
update_for_pipeline
(
self
)
end
end
private
private
...
...
app/models/project.rb
View file @
02072e17
...
@@ -1197,7 +1197,7 @@ class Project < ActiveRecord::Base
...
@@ -1197,7 +1197,7 @@ class Project < ActiveRecord::Base
end
end
def
pipeline_status
def
pipeline_status
@pipeline_status
||=
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
.
load_for_project
(
self
)
@pipeline_status
||=
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
.
load_for_project
(
self
)
end
end
def
mark_import_as_failed
(
error_message
)
def
mark_import_as_failed
(
error_message
)
...
...
lib/gitlab/cache/ci/project_
build
_status.rb
→
lib/gitlab/cache/ci/project_
pipeline
_status.rb
View file @
02072e17
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
module
Gitlab
module
Gitlab
module
Cache
module
Cache
module
Ci
module
Ci
class
Project
Build
Status
class
Project
Pipeline
Status
attr_accessor
:sha
,
:status
,
:project
,
:loaded
attr_accessor
:sha
,
:status
,
:project
,
:loaded
delegate
:commit
,
to: :project
delegate
:commit
,
to: :project
...
...
spec/helpers/ci_status_helper_spec.rb
View file @
02072e17
...
@@ -19,7 +19,7 @@ describe CiStatusHelper do
...
@@ -19,7 +19,7 @@ describe CiStatusHelper do
describe
"#pipeline_status_cache_key"
do
describe
"#pipeline_status_cache_key"
do
it
"builds a cache key for pipeline status"
do
it
"builds a cache key for pipeline status"
do
pipeline_status
=
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
.
new
(
pipeline_status
=
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
.
new
(
build
(
:project
),
build
(
:project
),
sha:
"123abc"
,
sha:
"123abc"
,
status:
"success"
status:
"success"
...
...
spec/lib/gitlab/cache/ci/project_
build
_status_spec.rb
→
spec/lib/gitlab/cache/ci/project_
pipeline
_status_spec.rb
View file @
02072e17
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
do
describe
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline_status
)
{
described_class
.
new
(
project
)
}
let
(
:pipeline_status
)
{
described_class
.
new
(
project
)
}
...
...
spec/models/ci/pipeline_spec.rb
View file @
02072e17
...
@@ -1083,7 +1083,7 @@ describe Ci::Pipeline, models: true do
...
@@ -1083,7 +1083,7 @@ describe Ci::Pipeline, models: true do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
sha:
'123456'
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
sha:
'123456'
)
}
it
'updates the cached status'
do
it
'updates the cached status'
do
expect
(
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
).
to
receive
(
:update_for_pipeline
).
expect
(
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
).
to
receive
(
:update_for_pipeline
).
with
(
pipeline
)
with
(
pipeline
)
pipeline
.
block
pipeline
.
block
...
...
spec/models/project_spec.rb
View file @
02072e17
...
@@ -1949,7 +1949,7 @@ describe Project, models: true do
...
@@ -1949,7 +1949,7 @@ describe Project, models: true do
describe
'#pipeline_status'
do
describe
'#pipeline_status'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
'builds a pipeline status'
do
it
'builds a pipeline status'
do
expect
(
project
.
pipeline_status
).
to
be_a
(
Gitlab
::
Cache
::
Ci
::
Project
Build
Status
)
expect
(
project
.
pipeline_status
).
to
be_a
(
Gitlab
::
Cache
::
Ci
::
Project
Pipeline
Status
)
end
end
it
'hase a loaded pipeline status'
do
it
'hase a loaded pipeline status'
do
...
...
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