Commit 5bb08b86 authored by Kati Paizee's avatar Kati Paizee

Merge branch 'aa-spelling-transfered' into 'master'

Misspelling for transferred

See merge request gitlab-org/gitlab!81785
parents c106c746 b0201f0c
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
/* /*
This change should be temporary, because the DOM currently gets This change should be temporary, because the DOM currently gets
generated from a ruby definition in `app/helpers/button_helper.rb`. generated from a ruby definition in `app/helpers/button_helper.rb`.
As soon as the `copy to clipboard` button will be transfered to As soon as the `copy to clipboard` button will be transferred to
Vue this should be adjusted as well. Vue this should be adjusted as well.
*/ */
flex: 1; flex: 1;
......
...@@ -16,5 +16,5 @@ ...@@ -16,5 +16,5 @@
.gl-alert.gl-alert-info.gl-mb-5 .gl-alert.gl-alert-info.gl-mb-5
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
= html_escape(_("This group can't be transfered because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe } = html_escape(_("This group can't be transferred because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe }
.js-transfer-group-form{ data: initial_data } .js-transfer-group-form{ data: initial_data }
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
### Security (5 changes) ### Security (5 changes)
- Don't show Contribution Analytics to users who are not group members. - Don't show Contribution Analytics to users who are not group members.
- Update epic tree when group is transfered. - Update epic tree when group is transferred.
- Fix Service Side Request Forgery in JenkinsDeprecatedService. - Fix Service Side Request Forgery in JenkinsDeprecatedService.
- Enforce vulnerability feedback pipeline is in the same project. - Enforce vulnerability feedback pipeline is in the same project.
- Enforce existing vulnerability feedback pipeline is in the same project. - Enforce existing vulnerability feedback pipeline is in the same project.
......
...@@ -37428,7 +37428,7 @@ msgstr "" ...@@ -37428,7 +37428,7 @@ msgstr ""
msgid "This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group." msgid "This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group."
msgstr "" msgstr ""
msgid "This group can't be transfered because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group." msgid "This group can't be transferred because it is linked to a subscription. To transfer this group, %{linkStart}link the subscription%{linkEnd} with a different group."
msgstr "" msgstr ""
msgid "This group cannot be invited to a project inside a group with enforced SSO" msgid "This group cannot be invited to a project inside a group with enforced SSO"
......
...@@ -109,7 +109,7 @@ describe('ValueStreamMetrics', () => { ...@@ -109,7 +109,7 @@ describe('ValueStreamMetrics', () => {
}); });
describe('filterFn', () => { describe('filterFn', () => {
const transferedMetricsData = prepareTimeMetricsData(metricsData, METRICS_POPOVER_CONTENT); const transferredMetricsData = prepareTimeMetricsData(metricsData, METRICS_POPOVER_CONTENT);
it('with a filter function, will call the function with the metrics data', async () => { it('with a filter function, will call the function with the metrics data', async () => {
const filteredData = [ const filteredData = [
...@@ -123,7 +123,7 @@ describe('ValueStreamMetrics', () => { ...@@ -123,7 +123,7 @@ describe('ValueStreamMetrics', () => {
await waitForPromises(); await waitForPromises();
expect(mockFilterFn).toHaveBeenCalledWith(transferedMetricsData); expect(mockFilterFn).toHaveBeenCalledWith(transferredMetricsData);
expect(wrapper.vm.metrics).toEqual(filteredData); expect(wrapper.vm.metrics).toEqual(filteredData);
}); });
...@@ -133,7 +133,7 @@ describe('ValueStreamMetrics', () => { ...@@ -133,7 +133,7 @@ describe('ValueStreamMetrics', () => {
await waitForPromises(); await waitForPromises();
expect(mockFilterFn).not.toHaveBeenCalled(); expect(mockFilterFn).not.toHaveBeenCalled();
expect(wrapper.vm.metrics).toEqual(transferedMetricsData); expect(wrapper.vm.metrics).toEqual(transferredMetricsData);
}); });
}); });
......
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