Commit 393892ec authored by Phil Hughes's avatar Phil Hughes

Merge branch '223042-Rename-'build'-to-'pipeline'-in-todos' into 'master'

Reword 'build' to 'pipeline' in todos

See merge request gitlab-org/gitlab!75901
parents bc3e7071 fee372c2
......@@ -18,7 +18,7 @@ module TodosHelper
when Todo::ASSIGNED then todo.self_added? ? 'assigned' : 'assigned you'
when Todo::REVIEW_REQUESTED then 'requested a review of'
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::APPROVAL_REQUIRED then "set #{todo_action_subject(todo)} as an approver for"
when Todo::UNMERGEABLE then 'Could not merge'
......
......@@ -178,7 +178,7 @@ RSpec.describe 'Dashboard > User filters todos', :js do
review_requested: ' requested a review of ',
mentioned: ' mentioned ',
marked: ' added a todo for ',
build_failed: ' build failed for '
build_failed: ' pipeline failed in '
}
action_name_text = action_names.delete(action_name)
......
......@@ -400,7 +400,7 @@ RSpec.describe 'Dashboard Todos' do
end
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
it 'links to the pipelines for the merge request' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment