BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0c3cef02
Commit
0c3cef02
authored
Mar 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Standardised the discussion headers
parent
e0960e28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
_commit.html.haml
app/views/projects/notes/discussions/_commit.html.haml
+5
-5
_outdated.html.haml
app/views/projects/notes/discussions/_outdated.html.haml
+5
-5
No files found.
app/views/projects/notes/discussions/_commit.html.haml
View file @
0c3cef02
...
@@ -3,15 +3,15 @@
...
@@ -3,15 +3,15 @@
-
commit_description
=
commit
?
'commit'
:
'a deleted commit'
-
commit_description
=
commit
?
'commit'
:
'a deleted commit'
.discussion.js-toggle-container
{
class:
note
.
discussion_id
}
.discussion.js-toggle-container
{
class:
note
.
discussion_id
}
.discussion-header
.discussion-header
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
.inline.discussion-headline-light
=
"
#{
note
.
author
.
to_reference
}
started a discussion on
#{
commit_description
}
"
-
if
commit
=
link_to
(
commit
.
short_id
,
namespace_project_commit_path
(
note
.
project
.
namespace
,
note
.
project
,
note
.
noteable
),
class:
'monospace'
)
.discussion-actions
.discussion-actions
=
link_to
"#"
,
class:
"note-action-button discussion-toggle-button js-toggle-button"
do
=
link_to
"#"
,
class:
"note-action-button discussion-toggle-button js-toggle-button"
do
%i
.fa.fa-chevron-up
%i
.fa.fa-chevron-up
Show/hide discussion
Show/hide discussion
%div
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
started a discussion on
#{
commit_description
}
-
if
commit
=
link_to
(
commit
.
short_id
,
namespace_project_commit_path
(
note
.
project
.
namespace
,
note
.
project
,
note
.
noteable
),
class:
'monospace'
)
.last-update.hide.js-toggle-content
.last-update.hide.js-toggle-content
-
last_note
=
discussion_notes
.
last
-
last_note
=
discussion_notes
.
last
last updated by
last updated by
...
...
app/views/projects/notes/discussions/_outdated.html.haml
View file @
0c3cef02
-
note
=
discussion_notes
.
first
-
note
=
discussion_notes
.
first
.discussion.js-toggle-container
{
class:
note
.
discussion_id
}
.discussion.js-toggle-container
{
class:
note
.
discussion_id
}
.discussion-header
.discussion-header
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
.inline.discussion-headline-light
=
"
#{
note
.
author
.
to_reference
}
started a discussion"
on the outdated diff
.discussion-actions
.discussion-actions
=
link_to
"#"
,
class:
"note-action-button discussion-toggle-button js-toggle-button"
do
=
link_to
"#"
,
class:
"note-action-button discussion-toggle-button js-toggle-button"
do
%i
.fa.fa-chevron-down
%i
.fa.fa-chevron-down
Show/hide discussion
Show/hide discussion
%div
.last-update.hide.js-toggle-content
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
started a discussion on the
outdated diff
%div
-
last_note
=
discussion_notes
.
last
-
last_note
=
discussion_notes
.
last
last updated by
last updated by
=
link_to_member
(
@project
,
last_note
.
author
,
avatar:
false
)
=
link_to_member
(
@project
,
last_note
.
author
,
avatar:
false
)
...
...
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