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
9424e052
Commit
9424e052
authored
Nov 08, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolved repo components
[ci skip]
parent
98da16a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
app/assets/javascripts/repo/components/repo_file.vue
app/assets/javascripts/repo/components/repo_file.vue
+0
-4
app/assets/javascripts/repo/components/repo_loading_file.vue
app/assets/javascripts/repo/components/repo_loading_file.vue
+0
-4
No files found.
app/assets/javascripts/repo/components/repo_file.vue
View file @
9424e052
...
...
@@ -54,14 +54,10 @@
<tr
class=
"file"
@
click.prevent=
"clickedTreeRow(file)"
>
<<<<<<<
HEAD
<td
:colspan=
"submoduleColSpan"
>
=======
<td
class=
"multi-file-table-col-name"
:colspan=
"submoduleColSpan"
>
>>>>>>> upstream/master
<i
class=
"fa fa-fw file-icon"
:class=
"fileIcon"
...
...
app/assets/javascripts/repo/components/repo_loading_file.vue
View file @
9424e052
...
...
@@ -19,11 +19,7 @@
class=
"loading-file"
aria-label=
"Loading files"
>
<<<<<<<
HEAD
<td>
=======
<td
class=
"multi-file-table-col-name"
>
>>>>>>> upstream/master
<skeleton-loading-container
:small=
"true"
/>
...
...
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