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
479020ec
Commit
479020ec
authored
Mar 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix project issues and merge requests pages
parent
0ec1c8ee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
app/helpers/gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+0
-1
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
No files found.
app/helpers/gitlab_routing_helper.rb
View file @
479020ec
...
@@ -47,6 +47,5 @@ module GitlabRoutingHelper
...
@@ -47,6 +47,5 @@ module GitlabRoutingHelper
def
project_snippet_url
(
entity
,
*
args
)
def
project_snippet_url
(
entity
,
*
args
)
namespace_project_snippet_url
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
namespace_project_snippet_url
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
end
end
end
end
app/views/projects/issues/_issue.html.haml
View file @
479020ec
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
issue
.
notes
.
count
=
issue
.
notes
.
count
.issue-info
.issue-info
=
link_to
"#
#{
issue
.
iid
}
"
,
project_issue_path
(
issue
.
project
,
issue
),
class:
"light"
=
link_to
"#
#{
issue
.
iid
}
"
,
issue_path
(
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 @
479020ec
...
@@ -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
=
link_to
"#
#{
merge_request
.
iid
}
"
,
project_merge_request_path
(
merge_request
.
target_project
,
merge_request
),
class:
"light"
=
link_to
"#
#{
merge_request
.
iid
}
"
,
merge_request_path
(
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
...
...
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