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
ad2720ae
Commit
ad2720ae
authored
Mar 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
82d4760d
00c042ea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
No files found.
app/views/projects/issues/_issue.html.haml
View file @
ad2720ae
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
issue
.
notes
.
count
=
issue
.
notes
.
count
.issue-info
.issue-info
%span
.light
=
"#
#{
issue
.
iid
}
"
=
link_to
"#
#{
issue
.
iid
}
"
,
project_issue_path
(
issue
.
project
,
issue
),
class:
"light
"
-
if
issue
.
assignee
-
if
issue
.
assignee
assigned to
#{
link_to_member
(
@project
,
issue
.
assignee
)
}
assigned to
#{
link_to_member
(
@project
,
issue
.
assignee
)
}
-
if
issue
.
votes_count
>
0
-
if
issue
.
votes_count
>
0
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
ad2720ae
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
%i
.fa.fa-comments
%i
.fa.fa-comments
=
merge_request
.
mr_and_commit_notes
.
count
=
merge_request
.
mr_and_commit_notes
.
count
.merge-request-info
.merge-request-info
%span
.light
=
"#
#{
merge_request
.
iid
}
"
=
link_to
"#
#{
merge_request
.
iid
}
"
,
project_merge_request_path
(
merge_request
.
target_project
,
merge_request
),
class:
"light
"
-
if
merge_request
.
assignee
-
if
merge_request
.
assignee
assigned
to
#{
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
)
}
assigned
to
#{
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
)
}
-
else
-
else
...
...
app/views/projects/show.html.haml
View file @
ad2720ae
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
%span
.light
Created on
%span
.light
Created on
#{
@project
.
created_at
.
stamp
(
'Aug 22, 2013'
)
}
#{
@project
.
created_at
.
stamp
(
'Aug 22, 2013'
)
}
%p
%p
%span
.light
Owned by
%span
.light
Owned by
#{
@project
.
group
?
"the"
:
nil
}
-
if
@project
.
group
-
if
@project
.
group
#{
link_to
@project
.
group
.
name
,
@project
.
group
}
group
#{
link_to
@project
.
group
.
name
,
@project
.
group
}
group
-
else
-
else
...
...
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