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
fee372c2
Commit
fee372c2
authored
Feb 24, 2022
by
Kev
Committed by
Phil Hughes
Feb 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reword 'build' to 'pipeline' in todos
Changelog: changed
parent
98fa61ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+1
-1
spec/features/dashboard/todos/todos_filtering_spec.rb
spec/features/dashboard/todos/todos_filtering_spec.rb
+1
-1
spec/features/dashboard/todos/todos_spec.rb
spec/features/dashboard/todos/todos_spec.rb
+1
-1
No files found.
app/helpers/todos_helper.rb
View file @
fee372c2
...
@@ -18,7 +18,7 @@ module TodosHelper
...
@@ -18,7 +18,7 @@ module TodosHelper
when
Todo
::
ASSIGNED
then
todo
.
self_added?
?
'assigned'
:
'assigned you'
when
Todo
::
ASSIGNED
then
todo
.
self_added?
?
'assigned'
:
'assigned you'
when
Todo
::
REVIEW_REQUESTED
then
'requested a review of'
when
Todo
::
REVIEW_REQUESTED
then
'requested a review of'
when
Todo
::
MENTIONED
then
"mentioned
#{
todo_action_subject
(
todo
)
}
on"
when
Todo
::
MENTIONED
then
"mentioned
#{
todo_action_subject
(
todo
)
}
on"
when
Todo
::
BUILD_FAILED
then
'The
build failed for
'
when
Todo
::
BUILD_FAILED
then
'The
pipeline failed in
'
when
Todo
::
MARKED
then
'added a todo for'
when
Todo
::
MARKED
then
'added a todo for'
when
Todo
::
APPROVAL_REQUIRED
then
"set
#{
todo_action_subject
(
todo
)
}
as an approver for"
when
Todo
::
APPROVAL_REQUIRED
then
"set
#{
todo_action_subject
(
todo
)
}
as an approver for"
when
Todo
::
UNMERGEABLE
then
'Could not merge'
when
Todo
::
UNMERGEABLE
then
'Could not merge'
...
...
spec/features/dashboard/todos/todos_filtering_spec.rb
View file @
fee372c2
...
@@ -178,7 +178,7 @@ RSpec.describe 'Dashboard > User filters todos', :js do
...
@@ -178,7 +178,7 @@ RSpec.describe 'Dashboard > User filters todos', :js do
review_requested:
' requested a review of '
,
review_requested:
' requested a review of '
,
mentioned:
' mentioned '
,
mentioned:
' mentioned '
,
marked:
' added a todo for '
,
marked:
' added a todo for '
,
build_failed:
'
build failed for
'
build_failed:
'
pipeline failed in
'
}
}
action_name_text
=
action_names
.
delete
(
action_name
)
action_name_text
=
action_names
.
delete
(
action_name
)
...
...
spec/features/dashboard/todos/todos_spec.rb
View file @
fee372c2
...
@@ -400,7 +400,7 @@ RSpec.describe 'Dashboard Todos' do
...
@@ -400,7 +400,7 @@ RSpec.describe 'Dashboard Todos' do
end
end
it
'shows the todo'
do
it
'shows the todo'
do
expect
(
page
).
to
have_content
'The
build failed for
merge request'
expect
(
page
).
to
have_content
'The
pipeline failed in
merge request'
end
end
it
'links to the pipelines for the merge request'
do
it
'links to the pipelines for the merge request'
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