Commit ce7abfbb authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 78150472 ee458c91
<script>
import { GlBadge } from '@gitlab/ui';
import { visitUrl } from '~/lib/utils/url_utility';
import { getIconName } from '../../utils/icon';
import getRefMixin from '../../mixins/get_ref';
......@@ -63,6 +64,8 @@ export default {
openRow() {
if (this.isFolder) {
this.$router.push(this.routerLinkTo);
} else {
visitUrl(this.url);
}
},
},
......
......@@ -670,7 +670,7 @@ class MergeRequest < ApplicationRecord
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435
Gitlab::GitalyClient.allow_n_plus_1_calls do
merge_request_diffs.create
merge_request_diffs.create!
reload_merge_request_diff
end
end
......
......@@ -58,7 +58,7 @@ To enable DAST in your project, define a job in your `.gitlab-ci.yml` file that
This can be done in two ways:
- For GitLab 11.9 and later, including the provided DAST `.gitlab-ci.yml` template (recommended).
- For GitLab 11.9 and later, including the provided `DAST.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
......
......@@ -66,8 +66,7 @@ file that generates the
This can be done in two ways:
- For GitLab 11.9 and later, including the provided Dependency Scanning
`.gitlab-ci.yml` template (recommended).
- For GitLab 11.9 and later, including the provided `Dependency-Scanning.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
......
......@@ -65,7 +65,7 @@ file that generates the [License Management report artifact](../../../ci/yaml/RE
This can be done in two ways:
- For GitLab 11.9 and later, including the provided License Management `.gitlab-ci.yml` template (recommended).
- For GitLab 11.9 and later, including the provided `License-Management.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
......
......@@ -80,7 +80,7 @@ To enable SAST in your project, define a job in your `.gitlab-ci.yml` file that
This can be done in two ways:
- For GitLab 11.9 and later, including the provided SAST `.gitlab-ci.yml` template (recommended).
- For GitLab 11.9 and later, including the provided `SAST.gitlab-ci.yml` template (recommended).
- Manually specifying the job definition. Not recommended unless using GitLab
11.8 and earlier.
......
......@@ -15,6 +15,7 @@ exports[`Repository table row component renders table row 1`] = `
<a
class="str-truncated"
href="https://test.com"
>
test
......
import { shallowMount, RouterLinkStub } from '@vue/test-utils';
import { GlBadge } from '@gitlab/ui';
import { visitUrl } from '~/lib/utils/url_utility';
import TableRow from '~/repository/components/table/row.vue';
jest.mock('~/lib/utils/url_utility');
let vm;
let $router;
......@@ -11,7 +14,10 @@ function factory(propsData = {}) {
};
vm = shallowMount(TableRow, {
propsData,
propsData: {
...propsData,
url: `https://test.com`,
},
mocks: {
$router,
},
......@@ -26,6 +32,7 @@ function factory(propsData = {}) {
describe('Repository table row component', () => {
afterEach(() => {
vm.destroy();
jest.clearAllMocks();
});
it('renders table row', () => {
......@@ -77,6 +84,28 @@ describe('Repository table row component', () => {
}
});
it.each`
type | pushes
${'tree'} | ${true}
${'file'} | ${false}
${'commit'} | ${false}
`('calls visitUrl if $type is not tree', ({ type, pushes }) => {
factory({
id: '1',
path: 'test',
type,
currentPath: '/',
});
vm.trigger('click');
if (pushes) {
expect(visitUrl).not.toHaveBeenCalled();
} else {
expect(visitUrl).toHaveBeenCalledWith('https://test.com');
}
});
it('renders commit ID for submodule', () => {
factory({
id: '1',
......
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