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
ce7abfbb
Commit
ce7abfbb
authored
Jun 13, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
78150472
ee458c91
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
7 deletions
+39
-7
app/assets/javascripts/repository/components/table/row.vue
app/assets/javascripts/repository/components/table/row.vue
+3
-0
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
doc/user/application_security/dast/index.md
doc/user/application_security/dast/index.md
+1
-1
doc/user/application_security/dependency_scanning/index.md
doc/user/application_security/dependency_scanning/index.md
+1
-2
doc/user/application_security/license_management/index.md
doc/user/application_security/license_management/index.md
+1
-1
doc/user/application_security/sast/index.md
doc/user/application_security/sast/index.md
+1
-1
spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
...epository/components/table/__snapshots__/row_spec.js.snap
+1
-0
spec/frontend/repository/components/table/row_spec.js
spec/frontend/repository/components/table/row_spec.js
+30
-1
No files found.
app/assets/javascripts/repository/components/table/row.vue
View file @
ce7abfbb
<
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
);
}
},
},
...
...
app/models/merge_request.rb
View file @
ce7abfbb
...
...
@@ -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
...
...
doc/user/application_security/dast/index.md
View file @
ce7abfbb
...
...
@@ -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.
...
...
doc/user/application_security/dependency_scanning/index.md
View file @
ce7abfbb
...
...
@@ -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.
...
...
doc/user/application_security/license_management/index.md
View file @
ce7abfbb
...
...
@@ -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.
...
...
doc/user/application_security/sast/index.md
View file @
ce7abfbb
...
...
@@ -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.
...
...
spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
View file @
ce7abfbb
...
...
@@ -15,6 +15,7 @@ exports[`Repository table row component renders table row 1`] = `
<a
class="str-truncated"
href="https://test.com"
>
test
...
...
spec/frontend/repository/components/table/row_spec.js
View file @
ce7abfbb
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
'
,
...
...
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