`mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the %{linkStart}troubleshooting documentation%{linkEnd} to see other possible actions.`,
=html_escape(_('Environment variables are applied to environments via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with %{code_open}K8S_SECRET_%{code_close}. You can set variables to be:'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=_('Variables store information, like passwords and secret keys, that you can use in job scripts. All projects on the instance can use these variables.')
=html_escape(_('%{code_open}Protected%{code_close} variables are only exposed to protected branches or tags.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=html_escape(_('%{code_open}Protected:%{code_close} Only exposed to protected branches or tags.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
%li
%li
=html_escape(_('%{code_open}Masked%{code_close} variables are hidden in job logs (though they must match certain regexp requirements to do so).'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=html_escape(_('%{code_open}Masked:%{code_close} Hidden in job logs. Must match masking requirements.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default').html_safe%{link_start: link_start,link_end: '</a>'.html_safe}
=s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default.').html_safe%{link_start: link_start,link_end: '</a>'.html_safe}
=html_escape(_('Environment variables are applied to environments via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with %{code_open}K8S_SECRET_%{code_close}. You can set variables to be:'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=_('Variables store information, like passwords and secret keys, that you can use in job scripts.')
=html_escape(_('%{code_open}Protected%{code_close} variables are only exposed to protected branches or tags.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=html_escape(_('%{code_open}Protected:%{code_close} Only exposed to protected branches or tags.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
%li
%li
=html_escape(_('%{code_open}Masked%{code_close} variables are hidden in job logs (though they must match certain regexp requirements to do so).'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=html_escape(_('%{code_open}Masked:%{code_close} Hidden in job logs. Must match masking requirements.'))%{code_open: '<code>'.html_safe,code_close: '</code>'.html_safe}
=s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default').html_safe%{link_start: link_start,link_end: '</a>'.html_safe}
=s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default.').html_safe%{link_start: link_start,link_end: '</a>'.html_safe}
@@ -222,6 +222,29 @@ This also applies if the pipeline has not been created yet, or if you are waitin
...
@@ -222,6 +222,29 @@ This also applies if the pipeline has not been created yet, or if you are waitin
for an external CI service. If you don't use pipelines for your project, then you
for an external CI service. If you don't use pipelines for your project, then you
should disable **Pipelines must succeed** so you can accept merge requests.
should disable **Pipelines must succeed** so you can accept merge requests.
### "The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the troubleshooting documentation to see other possible actions." message
This message is shown if the [merge request pipeline](merge_request_pipelines/index.md),
or [merge train pipeline](merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md)
has failed or been canceled.
If a merge request pipeline or merged result pipeline was canceled or failed, you can:
- Re-run the entire pipeline by clicking **Run pipeline** in the pipeline tab in the merge request.
-[Retry only the jobs that failed](pipelines/index.md#view-pipelines). If you re-run the entire pipeline, this is not necessary.
- Push a new commit to fix the failure.
If the merge train pipeline has failed, you can:
- Check the failure and determine if you can use the [`/merge` quick action](../user/project/quick_actions.md) to immediately add the merge request to the train again.
- Re-run the entire pipeline by clicking **Run pipeline** in the pipeline tab in the merge request, then add the merge request to the train again.
- Push a commit to fix the failure, then add the merge request to the train again.
If the merge train pipeline was canceled before the merge request was merged, without a failure, you can:
- Add it to the train again.
## Pipeline warnings
## Pipeline warnings
Pipeline configuration warnings are shown when you:
Pipeline configuration warnings are shown when you:
=_('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe%{eula_link_start: eula_link_start,eula_url: eula_url,eula_link_end: '</a>'.html_safe}
=_('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe%{eula_link_start: eula_link_start,eula_url: eula_url,eula_link_end: '</a>'.html_safe}
it('returns default empty state sub-message when `hasFiltersApplied` props is false',(done)=>{
Vue.nextTick()
.then(()=>{
expect(vm.subMessage).toBe(
'To view the roadmap, add a start or due date to one of your epics in this group or its subgroups; from Dec 17, 2017 to Feb 9, 2018.',
);
})
.then(done)
.catch(done.fail);
});
it('returns empty state sub-message when `hasFiltersApplied` prop is true',(done)=>{
vm.hasFiltersApplied=true;
Vue.nextTick()
.then(()=>{
expect(vm.subMessage).toBe(
'To widen your search, change or remove filters; from Dec 17, 2017 to Feb 15, 2018.',
);
})
.then(done)
.catch(done.fail);
});
});
});
describe('with child epics context',()=>{
expect(findSubTitle().text()).toBe(
it('returns empty state sub-message when `isChildEpics` is set to `true`',(done)=>{
'To view the roadmap, add a start or due date to one of your epics in this group or its subgroups; from Nov 1, 2017 to Jun 30, 2018.',
vm.isChildEpics=true;
);
Vue.nextTick()
.then(()=>{
expect(vm.subMessage).toBe(
'To view the roadmap, add a start or due date to one of the <a href="https://docs.gitlab.com/ee/user/group/epics/#multi-level-child-epics" target="_blank" rel="noopener noreferrer nofollow">child epics</a>.',
);
})
.then(done)
.catch(done.fail);
});
});
});
});
describe('timeframeRange',()=>{
it('renders empty state sub-title when `hasFiltersApplied` prop is true',()=>{
it('returns correct timeframe startDate and endDate in words',()=>{
msgid "Environment variables are applied to environments via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with %{code_open}K8S_SECRET_%{code_close}. You can set variables to be:"
msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default."
msgstr ""
msgstr ""
msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default"
msgid "Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default."
msgstr ""
msgid "Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default"
msgstr ""
msgstr ""
msgid "Environment:"
msgid "Environment:"
...
@@ -17223,9 +17220,6 @@ msgstr ""
...
@@ -17223,9 +17220,6 @@ msgstr ""
msgid "Make sure you save it - you won't be able to access it again."
msgid "Make sure you save it - you won't be able to access it again."
msgstr ""
msgstr ""
msgid "Make this epic confidential"
msgstr ""
msgid "Makes this issue confidential."
msgid "Makes this issue confidential."
msgstr ""
msgstr ""
...
@@ -20205,9 +20199,6 @@ msgstr ""
...
@@ -20205,9 +20199,6 @@ msgstr ""
msgid "Or you can choose one of the suggested colors below"
msgid "Or you can choose one of the suggested colors below"
msgstr ""
msgstr ""
msgid "Origin"
msgstr ""
msgid "Orphaned member"
msgid "Orphaned member"
msgstr ""
msgstr ""
...
@@ -28865,7 +28856,7 @@ msgstr ""
...
@@ -28865,7 +28856,7 @@ msgstr ""
msgid "These runners are specific to this project."
msgid "These runners are specific to this project."
msgstr ""
msgstr ""
msgid "These variables are configured in the parent group settings, and will be active in the current project in addition to the project variables."
msgid "These variables are inherited from the parent group."
msgstr ""
msgstr ""
msgid "Third Party Advisory Link"
msgid "Third Party Advisory Link"
...
@@ -29039,9 +29030,6 @@ msgstr ""
...
@@ -29039,9 +29030,6 @@ msgstr ""
msgid "This epic already has the maximum number of child epics."
msgid "This epic already has the maximum number of child epics."
msgstr ""
msgstr ""
msgid "This epic and its child elements will only be visible to team members with at minimum Reporter access."
msgstr ""
msgid "This epic does not exist or you don't have sufficient permission."
msgid "This epic does not exist or you don't have sufficient permission."
msgstr ""
msgstr ""
...
@@ -31310,6 +31298,15 @@ msgstr ""
...
@@ -31310,6 +31298,15 @@ msgstr ""
msgid "Variables"
msgid "Variables"
msgstr ""
msgstr ""
msgid "Variables can be:"
msgstr ""
msgid "Variables store information, like passwords and secret keys, that you can use in job scripts."
msgstr ""
msgid "Variables store information, like passwords and secret keys, that you can use in job scripts. All projects on the instance can use these variables."
msgstr ""
msgid "Various container registry settings."
msgid "Various container registry settings."
msgstr ""
msgstr ""
...
@@ -34179,7 +34176,7 @@ msgstr ""
...
@@ -34179,7 +34176,7 @@ msgstr ""
msgid "mrWidget|The changes will be merged into"
msgid "mrWidget|The changes will be merged into"
msgstr ""
msgstr ""
msgid "mrWidget|The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure"
msgid "mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the %{linkStart}troubleshooting documentation%{linkEnd} to see other possible actions."
msgstr ""
msgstr ""
msgid "mrWidget|The source branch HEAD has recently changed. Please reload the page and review the changes before merging"
msgid "mrWidget|The source branch HEAD has recently changed. Please reload the page and review the changes before merging"
expect(page).tohave_content('Please retry the job or push a new commit to fix the failure')
expect(page).tohave_content('The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the troubleshooting documentation to see other possible actions.')
end
end
end
end
...
@@ -70,7 +70,7 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js do
...
@@ -70,7 +70,7 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js do
wait_for_requests
wait_for_requests
expect(page).not_tohave_button'Merge'
expect(page).not_tohave_button'Merge'
expect(page).tohave_content('Please retry the job or push a new commit to fix the failure')
expect(page).tohave_content('The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the troubleshooting documentation to see other possible actions.')
exports[`PipelineFailed should render error message with a disabled merge button 1`] = `
<div
class="mr-widget-body media"
>
<status-icon-stub
showdisabledbutton="true"
status="warning"
/>
<div
class="media-body space-children"
>
<span
class="bold"
>
<gl-sprintf-stub
message="The pipeline for this merge request did not complete. Push a new commit to fix the failure or check the %{linkStart}troubleshooting documentation%{linkEnd} to see other possible actions."
