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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
579fa8b8
Commit
579fa8b8
authored
Apr 12, 2019
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename CI related selectors
parent
a67b1c17
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
24 additions
and
24 deletions
+24
-24
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+2
-2
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+1
-1
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+2
-2
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+3
-3
app/models/project_services/mock_ci_service.rb
app/models/project_services/mock_ci_service.rb
+1
-1
app/presenters/merge_request_presenter.rb
app/presenters/merge_request_presenter.rb
+1
-1
doc/user/project/integrations/mock_ci.md
doc/user/project/integrations/mock_ci.md
+1
-1
lib/gitlab/ci/status/build/failed_allowed.rb
lib/gitlab/ci/status/build/failed_allowed.rb
+1
-1
lib/gitlab/ci/status/success_warning.rb
lib/gitlab/ci/status/success_warning.rb
+1
-1
spec/javascripts/jobs/mock_data.js
spec/javascripts/jobs/mock_data.js
+3
-3
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
.../javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
+2
-2
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
+1
-1
spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb
spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb
+1
-1
spec/lib/gitlab/ci/status/success_warning_spec.rb
spec/lib/gitlab/ci/status/success_warning_spec.rb
+1
-1
spec/presenters/merge_request_presenter_spec.rb
spec/presenters/merge_request_presenter_spec.rb
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
579fa8b8
...
@@ -112,7 +112,7 @@ export default class MergeRequestStore {
...
@@ -112,7 +112,7 @@ export default class MergeRequestStore {
this
.
ciStatus
=
data
.
ci_status
;
this
.
ciStatus
=
data
.
ci_status
;
this
.
isPipelineFailed
=
this
.
ciStatus
===
'
failed
'
||
this
.
ciStatus
===
'
canceled
'
;
this
.
isPipelineFailed
=
this
.
ciStatus
===
'
failed
'
||
this
.
ciStatus
===
'
canceled
'
;
this
.
isPipelinePassing
=
this
.
isPipelinePassing
=
this
.
ciStatus
===
'
success
'
||
this
.
ciStatus
===
'
success
_with_
warnings
'
;
this
.
ciStatus
===
'
success
'
||
this
.
ciStatus
===
'
success
-with-
warnings
'
;
this
.
isPipelineSkipped
=
this
.
ciStatus
===
'
skipped
'
;
this
.
isPipelineSkipped
=
this
.
ciStatus
===
'
skipped
'
;
this
.
pipelineDetailedStatus
=
pipelineStatus
;
this
.
pipelineDetailedStatus
=
pipelineStatus
;
this
.
isPipelineActive
=
data
.
pipeline
?
data
.
pipeline
.
active
:
false
;
this
.
isPipelineActive
=
data
.
pipeline
?
data
.
pipeline
.
active
:
false
;
...
...
app/assets/stylesheets/framework/icons.scss
View file @
579fa8b8
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
}
}
.ci-status-icon-pending
,
.ci-status-icon-pending
,
.ci-status-icon-failed
_with_
warnings
,
.ci-status-icon-failed
-with-
warnings
,
.ci-status-icon-success
_with_
warnings
{
.ci-status-icon-success
-with-
warnings
{
svg
{
svg
{
fill
:
$orange-500
;
fill
:
$orange-500
;
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
579fa8b8
...
@@ -785,7 +785,7 @@
...
@@ -785,7 +785,7 @@
}
}
&
.ci-status-icon-pending
,
&
.ci-status-icon-pending
,
&
.ci-status-icon-success
_with_
warnings
{
&
.ci-status-icon-success
-with-
warnings
{
@include
mini-pipeline-graph-color
(
$white
,
$orange-100
,
$orange-200
,
$orange-500
,
$orange-600
,
$orange-700
);
@include
mini-pipeline-graph-color
(
$white
,
$orange-100
,
$orange-200
,
$orange-500
,
$orange-600
,
$orange-700
);
}
}
...
...
app/assets/stylesheets/pages/status.scss
View file @
579fa8b8
...
@@ -38,8 +38,8 @@
...
@@ -38,8 +38,8 @@
}
}
&
.ci-pending
,
&
.ci-pending
,
&
.ci-failed
_with_
warnings
,
&
.ci-failed
-with-
warnings
,
&
.ci-success
_with_
warnings
{
&
.ci-success
-with-
warnings
{
@include
status-color
(
$orange-100
,
$orange-500
,
$orange-700
);
@include
status-color
(
$orange-100
,
$orange-500
,
$orange-700
);
}
}
...
...
app/helpers/ci_status_helper.rb
View file @
579fa8b8
...
@@ -16,7 +16,7 @@ module CiStatusHelper
...
@@ -16,7 +16,7 @@ module CiStatusHelper
label
=
case
status
label
=
case
status
when
'success'
when
'success'
'passed'
'passed'
when
'success
_with_
warnings'
when
'success
-with-
warnings'
'passed with warnings'
'passed with warnings'
when
'manual'
when
'manual'
'waiting for manual action'
'waiting for manual action'
...
@@ -37,7 +37,7 @@ module CiStatusHelper
...
@@ -37,7 +37,7 @@ module CiStatusHelper
case
status
case
status
when
'success'
when
'success'
s_
(
'CiStatusText|passed'
)
s_
(
'CiStatusText|passed'
)
when
'success
_with_
warnings'
when
'success
-with-
warnings'
s_
(
'CiStatusText|passed'
)
s_
(
'CiStatusText|passed'
)
when
'manual'
when
'manual'
s_
(
'CiStatusText|blocked'
)
s_
(
'CiStatusText|blocked'
)
...
@@ -71,7 +71,7 @@ module CiStatusHelper
...
@@ -71,7 +71,7 @@ module CiStatusHelper
case
status
case
status
when
'success'
when
'success'
'status_success'
'status_success'
when
'success
_with_
warnings'
when
'success
-with-
warnings'
'status_warning'
'status_warning'
when
'failed'
when
'failed'
'status_failed'
'status_failed'
...
...
app/models/project_services/mock_ci_service.rb
View file @
579fa8b8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# For an example companion mocking service, see https://gitlab.com/gitlab-org/gitlab-mock-ci-service
# For an example companion mocking service, see https://gitlab.com/gitlab-org/gitlab-mock-ci-service
class
MockCiService
<
CiService
class
MockCiService
<
CiService
ALLOWED_STATES
=
%w[failed canceled running pending success success
_with_
warnings skipped not_found]
.
freeze
ALLOWED_STATES
=
%w[failed canceled running pending success success
-with-
warnings skipped not_found]
.
freeze
prop_accessor
:mock_service_url
prop_accessor
:mock_service_url
validates
:mock_service_url
,
presence:
true
,
public_url:
true
,
if: :activated?
validates
:mock_service_url
,
presence:
true
,
public_url:
true
,
if: :activated?
...
...
app/presenters/merge_request_presenter.rb
View file @
579fa8b8
...
@@ -13,7 +13,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
...
@@ -13,7 +13,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
def
ci_status
def
ci_status
if
pipeline
if
pipeline
status
=
pipeline
.
status
status
=
pipeline
.
status
status
=
"success
_with_
warnings"
if
pipeline
.
success?
&&
pipeline
.
has_warnings?
status
=
"success
-with-
warnings"
if
pipeline
.
success?
&&
pipeline
.
has_warnings?
status
||
"preparing"
status
||
"preparing"
else
else
...
...
doc/user/project/integrations/mock_ci.md
View file @
579fa8b8
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
To set up the mock CI service server, respond to the following endpoints
To set up the mock CI service server, respond to the following endpoints
-
`commit_status`
:
`#{project.namespace.path}/#{project.path}/status/#{sha}.json`
-
`commit_status`
:
`#{project.namespace.path}/#{project.path}/status/#{sha}.json`
-
Have your service return
`200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success
_with_
warnings'|'skipped'|'not_found'] }`
-
Have your service return
`200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success
-with-
warnings'|'skipped'|'not_found'] }`
-
If the service returns a 404, it is interpreted as
`pending`
-
If the service returns a 404, it is interpreted as
`pending`
-
`build_page`
:
`#{project.namespace.path}/#{project.path}/status/#{sha}`
-
`build_page`
:
`#{project.namespace.path}/#{project.path}/status/#{sha}`
-
Just where the build is linked to, doesn't matter if implemented
-
Just where the build is linked to, doesn't matter if implemented
...
...
lib/gitlab/ci/status/build/failed_allowed.rb
View file @
579fa8b8
...
@@ -14,7 +14,7 @@ module Gitlab
...
@@ -14,7 +14,7 @@ module Gitlab
end
end
def
group
def
group
'failed
_with_
warnings'
'failed
-with-
warnings'
end
end
def
status_tooltip
def
status_tooltip
...
...
lib/gitlab/ci/status/success_warning.rb
View file @
579fa8b8
...
@@ -21,7 +21,7 @@ module Gitlab
...
@@ -21,7 +21,7 @@ module Gitlab
end
end
def
group
def
group
'success
_with_
warnings'
'success
-with-
warnings'
end
end
def
self
.
matches?
(
subject
,
user
)
def
self
.
matches?
(
subject
,
user
)
...
...
spec/javascripts/jobs/mock_data.js
View file @
579fa8b8
...
@@ -678,7 +678,7 @@ export const stages = [
...
@@ -678,7 +678,7 @@ export const stages = [
icon
:
'
status_warning
'
,
icon
:
'
status_warning
'
,
text
:
'
failed
'
,
text
:
'
failed
'
,
label
:
'
failed (allowed to fail)
'
,
label
:
'
failed (allowed to fail)
'
,
group
:
'
failed
_with_
warnings
'
,
group
:
'
failed
-with-
warnings
'
,
tooltip
:
'
failed - (unknown failure) (allowed to fail)
'
,
tooltip
:
'
failed - (unknown failure) (allowed to fail)
'
,
has_details
:
true
,
has_details
:
true
,
details_path
:
'
/gitlab-org/gitlab-shell/-/jobs/454
'
,
details_path
:
'
/gitlab-org/gitlab-shell/-/jobs/454
'
,
...
@@ -710,7 +710,7 @@ export const stages = [
...
@@ -710,7 +710,7 @@ export const stages = [
icon
:
'
status_warning
'
,
icon
:
'
status_warning
'
,
text
:
'
failed
'
,
text
:
'
failed
'
,
label
:
'
failed (allowed to fail)
'
,
label
:
'
failed (allowed to fail)
'
,
group
:
'
failed
_with_
warnings
'
,
group
:
'
failed
-with-
warnings
'
,
tooltip
:
'
failed - (unknown failure) (allowed to fail)
'
,
tooltip
:
'
failed - (unknown failure) (allowed to fail)
'
,
has_details
:
true
,
has_details
:
true
,
details_path
:
'
/gitlab-org/gitlab-shell/-/jobs/454
'
,
details_path
:
'
/gitlab-org/gitlab-shell/-/jobs/454
'
,
...
@@ -738,7 +738,7 @@ export const stages = [
...
@@ -738,7 +738,7 @@ export const stages = [
icon
:
'
status_warning
'
,
icon
:
'
status_warning
'
,
text
:
'
passed
'
,
text
:
'
passed
'
,
label
:
'
passed with warnings
'
,
label
:
'
passed with warnings
'
,
group
:
'
success
_with_
warnings
'
,
group
:
'
success
-with-
warnings
'
,
tooltip
:
'
passed
'
,
tooltip
:
'
passed
'
,
has_details
:
true
,
has_details
:
true
,
details_path
:
'
/gitlab-org/gitlab-shell/pipelines/27#test
'
,
details_path
:
'
/gitlab-org/gitlab-shell/pipelines/27#test
'
,
...
...
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
View file @
579fa8b8
...
@@ -36,8 +36,8 @@ describe('MergeRequestStore', () => {
...
@@ -36,8 +36,8 @@ describe('MergeRequestStore', () => {
expect
(
store
.
isPipelinePassing
).
toBe
(
true
);
expect
(
store
.
isPipelinePassing
).
toBe
(
true
);
});
});
it
(
'
is true when the CI status is `success
_with_
warnings`
'
,
()
=>
{
it
(
'
is true when the CI status is `success
-with-
warnings`
'
,
()
=>
{
store
.
setData
({
...
mockData
,
ci_status
:
'
success
_with_
warnings
'
});
store
.
setData
({
...
mockData
,
ci_status
:
'
success
-with-
warnings
'
});
expect
(
store
.
isPipelinePassing
).
toBe
(
true
);
expect
(
store
.
isPipelinePassing
).
toBe
(
true
);
});
});
...
...
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
View file @
579fa8b8
...
@@ -59,7 +59,7 @@ describe('CI Badge Link Component', () => {
...
@@ -59,7 +59,7 @@ describe('CI Badge Link Component', () => {
success_warining
:
{
success_warining
:
{
text
:
'
passed
'
,
text
:
'
passed
'
,
label
:
'
passed
'
,
label
:
'
passed
'
,
group
:
'
success
_with_
warnings
'
,
group
:
'
success
-with-
warnings
'
,
icon
:
'
status_warning
'
,
icon
:
'
status_warning
'
,
details_path
:
'
status/warning
'
,
details_path
:
'
status/warning
'
,
},
},
...
...
spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb
View file @
579fa8b8
...
@@ -31,7 +31,7 @@ describe Gitlab::Ci::Status::Build::FailedAllowed do
...
@@ -31,7 +31,7 @@ describe Gitlab::Ci::Status::Build::FailedAllowed do
describe
'#group'
do
describe
'#group'
do
it
'returns status failed with warnings status group'
do
it
'returns status failed with warnings status group'
do
expect
(
subject
.
group
).
to
eq
'failed
_with_
warnings'
expect
(
subject
.
group
).
to
eq
'failed
-with-
warnings'
end
end
end
end
...
...
spec/lib/gitlab/ci/status/success_warning_spec.rb
View file @
579fa8b8
...
@@ -20,7 +20,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
...
@@ -20,7 +20,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
end
end
describe
'#group'
do
describe
'#group'
do
it
{
expect
(
subject
.
group
).
to
eq
'success
_with_
warnings'
}
it
{
expect
(
subject
.
group
).
to
eq
'success
-with-
warnings'
}
end
end
describe
'.matches?'
do
describe
'.matches?'
do
...
...
spec/presenters/merge_request_presenter_spec.rb
View file @
579fa8b8
...
@@ -40,8 +40,8 @@ describe MergeRequestPresenter do
...
@@ -40,8 +40,8 @@ describe MergeRequestPresenter do
allow
(
pipeline
).
to
receive
(
:has_warnings?
)
{
true
}
allow
(
pipeline
).
to
receive
(
:has_warnings?
)
{
true
}
end
end
it
'returns "success
_with_
warnings"'
do
it
'returns "success
-with-
warnings"'
do
is_expected
.
to
eq
(
'success
_with_
warnings'
)
is_expected
.
to
eq
(
'success
-with-
warnings'
)
end
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