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
ac99441d
Commit
ac99441d
authored
May 03, 2017
by
blackst0ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change 'exclude_author' param
parent
aaa70a62
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-2
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+1
-1
app/views/shared/notes/_note.html.haml
app/views/shared/notes/_note.html.haml
+1
-1
app/views/shared/snippets/_header.html.haml
app/views/shared/snippets/_header.html.haml
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
ac99441d
...
...
@@ -180,14 +180,14 @@ module ApplicationHelper
element
end
def
edited_time_ago_with_tooltip
(
object
,
placement:
'top'
,
html_class:
'time_ago'
,
in
clude_author:
false
)
def
edited_time_ago_with_tooltip
(
object
,
placement:
'top'
,
html_class:
'time_ago'
,
ex
clude_author:
false
)
return
if
object
.
last_edited_at
==
object
.
created_at
||
object
.
last_edited_at
.
blank?
content_tag
:small
,
class:
'edited-text'
do
output
=
content_tag
(
:span
,
'Edited '
)
output
<<
time_ago_with_tooltip
(
object
.
last_edited_at
,
placement:
placement
,
html_class:
html_class
)
if
in
clude_author
&&
object
.
last_edited_by
if
!
ex
clude_author
&&
object
.
last_edited_by
output
<<
content_tag
(
:span
,
' by '
)
output
<<
link_to_member
(
object
.
project
,
object
.
last_edited_by
,
avatar:
false
,
author_class:
nil
)
end
...
...
app/views/projects/issues/show.html.haml
View file @
ac99441d
...
...
@@ -61,7 +61,7 @@
=
markdown_field
(
@issue
,
:description
)
%textarea
.hidden.js-task-list-field
=
@issue
.
description
=
edited_time_ago_with_tooltip
(
@issue
,
placement:
'bottom'
,
html_class:
'issue_edited_ago'
,
include_author:
true
)
=
edited_time_ago_with_tooltip
(
@issue
,
placement:
'bottom'
,
html_class:
'issue_edited_ago'
)
#merge-requests
{
data:
{
url:
referenced_merge_requests_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
// This element is filled in using JavaScript.
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
ac99441d
...
...
@@ -10,4 +10,4 @@
%textarea
.hidden.js-task-list-field
=
@merge_request
.
description
=
edited_time_ago_with_tooltip
(
@merge_request
,
placement:
'bottom'
,
include_author:
true
)
=
edited_time_ago_with_tooltip
(
@merge_request
,
placement:
'bottom'
)
app/views/shared/notes/_note.html.haml
View file @
ac99441d
...
...
@@ -40,7 +40,7 @@
.note-body
{
class:
note_editable
?
'js-task-list-container'
:
''
}
.note-text.md
=
note
.
redacted_note_html
=
edited_time_ago_with_tooltip
(
note
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
,
include_author:
true
)
=
edited_time_ago_with_tooltip
(
note
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
)
-
if
note_editable
-
if
note
.
for_personal_snippet?
=
render
'snippets/notes/edit'
,
note:
note
...
...
app/views/shared/snippets/_header.html.haml
View file @
ac99441d
...
...
@@ -21,4 +21,4 @@
=
markdown_field
(
@snippet
,
:title
)
-
if
@snippet
.
updated_at
!=
@snippet
.
created_at
=
edited_time_ago_with_tooltip
(
@snippet
,
placement:
'bottom'
,
html_class:
'snippet-edited-ago'
)
=
edited_time_ago_with_tooltip
(
@snippet
,
placement:
'bottom'
,
html_class:
'snippet-edited-ago'
,
exclude_author:
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