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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
8e8df6d5
Commit
8e8df6d5
authored
Feb 23, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed un-used variables
parent
fbe6b8ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+0
-2
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/events_helper.rb
View file @
8e8df6d5
...
@@ -155,8 +155,6 @@ module EventsHelper
...
@@ -155,8 +155,6 @@ module EventsHelper
def
event_note_title_html
(
event
)
def
event_note_title_html
(
event
)
if
event
.
note_target
if
event
.
note_target
link_prefix
=
event
.
note_target
.
class
.
reference_prefix
if
event
.
note_commit?
if
event
.
note_commit?
link_to
(
link_to
(
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
8e8df6d5
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
=
note_count
=
note_count
.merge-request-info
.merge-request-info
\
#{
merge_request
.
to_reference
}
·
#{
merge_request
.
to_reference
}
·
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
...
...
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