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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
39018a74
Commit
39018a74
authored
Dec 01, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code-fork replacements
parent
1e8de503
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/javascripts/vue_shared/components/commit.vue
app/assets/javascripts/vue_shared/components/commit.vue
+6
-5
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/commit.vue
View file @
39018a74
...
...
@@ -2,13 +2,14 @@
import
commitIconSvg
from
'
icons/_icon_commit.svg
'
;
import
userAvatarLink
from
'
./user_avatar/user_avatar_link.vue
'
;
import
tooltip
from
'
../directives/tooltip
'
;
import
Icon
from
'
../../vue_shared/components/icon.vue
'
;
export
default
{
props
:
{
/**
* Indicates the existance of a tag.
* Used to render the correct icon, if true will render `fa-tag` icon,
* if false will render
`fa-code-fork` icon.
* if false will render
a svg sprite fork icon
*/
tag
:
{
type
:
Boolean
,
...
...
@@ -107,6 +108,7 @@
},
components
:
{
userAvatarLink
,
Icon
,
},
created
()
{
this
.
commitIconSvg
=
commitIconSvg
;
...
...
@@ -123,11 +125,10 @@
class=
"fa fa-tag"
aria-hidden=
"true"
>
</i>
<i
<i
con
v-if=
"!tag"
class=
"fa fa-code-fork"
aria-hidden=
"true"
>
</i>
name=
"fork"
>
</icon>
</div>
<a
...
...
app/views/projects/blob/_editor.html.haml
View file @
39018a74
...
...
@@ -3,7 +3,7 @@
.file-holder-bottom-radius.file-holder.file.append-bottom-default
.js-file-title.file-title.clearfix
{
data:
{
current_action:
action
}
}
.editor-ref
=
sprite_icon
(
'fork'
)
=
sprite_icon
(
'fork'
,
size:
12
)
=
ref
%span
.editor-file-name
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
...
...
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