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
9a3cab6b
Commit
9a3cab6b
authored
Jun 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e93f6b03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
39 deletions
+0
-39
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+0
-39
app/views/projects/notes/_outdated_discussion.html.haml
app/views/projects/notes/_outdated_discussion.html.haml
+0
-0
No files found.
app/views/projects/notes/_discussion.html.haml
View file @
9a3cab6b
...
@@ -6,42 +6,3 @@
...
@@ -6,42 +6,3 @@
=
render
"projects/notes/discussions/active"
,
discussion_notes:
discussion_notes
=
render
"projects/notes/discussions/active"
,
discussion_notes:
discussion_notes
-
else
-
else
=
render
"projects/notes/discussions/commit"
,
discussion_notes:
discussion_notes
=
render
"projects/notes/discussions/commit"
,
discussion_notes:
discussion_notes
-#.discussion.js-toggle-container{ class: note.discussion_id }
.discussion-header
.discussion-actions
= link_to "#", class: "js-toggle-button" do
%i.icon-chevron-up
Show/hide discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32"
%div
= link_to_member(@project, note.author, avatar: false)
- if note.for_merge_request?
- if note.diff
started a discussion on the diff
= link_to_merge_request_diff_line_note(note)
- else
started
%strong
%i.icon-remove
outdated
discussion on this merge request diff
- elsif note.for_commit?
started a discussion on commit
#{link_to note.noteable.short_id, project_commit_path(note.project, note.noteable)}
= link_to_commit_diff_line_note(note) if note.for_diff_line?
- else
%cite.cgray started a discussion
%div
- last_note = discussion_notes.last
last updated by
= link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body.js-toggle-content
- if note.for_diff_line?
= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
- else
.notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes
= link_to_reply_diff(discussion_notes.first)
app/views/projects/notes/_outdated_discussion.html.haml
deleted
100644 → 0
View file @
e93f6b03
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