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
44c2f57b
Commit
44c2f57b
authored
Aug 06, 2020
by
Robert Hunt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial MR review feedback
Removed unused grid-merge-request class and updated mr-1 to gl-mr-2
parent
948a83f0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/approvers.vue
...pliance_dashboard/components/merge_requests/approvers.vue
+1
-1
ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/merge_request.vue
...nce_dashboard/components/merge_requests/merge_request.vue
+2
-2
ee/spec/frontend/compliance_dashboard/components/merge_requests/__snapshots__/approvers_spec.js.snap
...nents/merge_requests/__snapshots__/approvers_spec.js.snap
+1
-1
ee/spec/frontend/compliance_dashboard/components/merge_requests/__snapshots__/merge_request_spec.js.snap
...s/merge_requests/__snapshots__/merge_request_spec.js.snap
+2
-2
No files found.
ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/approvers.vue
View file @
44c2f57b
...
...
@@ -96,7 +96,7 @@ export default {
:entity-id=
"approver.id"
:entity-name=
"approver.name"
:size=
"16"
class=
"
mr-1
"
class=
"
gl-mr-2
"
/>
<span>
{{ approver.name }}
</span>
</gl-avatar-link>
...
...
ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/merge_request.vue
View file @
44c2f57b
...
...
@@ -22,7 +22,7 @@ export default {
<
template
>
<div
class=
"g
rid-merge-request g
l-grid-col-start-1 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-p-5"
class=
"gl-grid-col-start-1 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-p-5"
data-testid=
"merge-request"
>
<a
:href=
"mergeRequest.path"
class=
"gl-display-block gl-text-gray-900 gl-font-weight-bold"
>
...
...
@@ -44,7 +44,7 @@ export default {
:entity-id=
"mergeRequest.author.id"
:entity-name=
"mergeRequest.author.name"
:size=
"16"
class=
"
mr-1
"
class=
"
gl-mr-2
"
/>
<span>
{{
mergeRequest
.
author
.
name
}}
</span>
</gl-avatar-link>
...
...
ee/spec/frontend/compliance_dashboard/components/merge_requests/__snapshots__/approvers_spec.js.snap
View file @
44c2f57b
...
...
@@ -31,7 +31,7 @@ exports[`MergeRequest component when there are approvers matches snapshot 1`] =
>
<gl-avatar-stub
alt="avatar"
class="
mr-1
"
class="
gl-mr-2
"
entityid="0"
entityname="User 0"
shape="circle"
...
...
ee/spec/frontend/compliance_dashboard/components/merge_requests/__snapshots__/merge_request_spec.js.snap
View file @
44c2f57b
...
...
@@ -2,7 +2,7 @@
exports[`MergeRequest component when there is a merge request matches the snapshot 1`] = `
<div
class="g
rid-merge-request g
l-grid-col-start-1 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-p-5"
class="gl-grid-col-start-1 gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-p-5"
data-testid="merge-request"
>
<a
...
...
@@ -35,7 +35,7 @@ exports[`MergeRequest component when there is a merge request matches the snapsh
>
<gl-avatar-stub
alt="avatar"
class="
mr-1
"
class="
gl-mr-2
"
entityid="1"
entityname="User 1"
shape="circle"
...
...
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