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
fbe6b8ee
Commit
fbe6b8ee
authored
Feb 23, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replaced prefix with to_reference method calls
parent
aff5e73f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
11 deletions
+7
-11
CHANGELOG
CHANGELOG
+1
-0
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+3
-8
app/views/events/event/_common.html.haml
app/views/events/event/_common.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/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+1
-1
No files found.
CHANGELOG
View file @
fbe6b8ee
...
@@ -30,6 +30,7 @@ v 8.5.1
...
@@ -30,6 +30,7 @@ v 8.5.1
- Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
- Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
- Update sentry-raven gem to 0.15.6
- Update sentry-raven gem to 0.15.6
- Add build coverage in project's builds page (Steffen Köhler)
- Add build coverage in project's builds page (Steffen Köhler)
- Changed # to ! for merge requests in activity view
v 8.5.0
v 8.5.0
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
...
...
app/helpers/events_helper.rb
View file @
fbe6b8ee
...
@@ -155,12 +155,7 @@ module EventsHelper
...
@@ -155,12 +155,7 @@ module EventsHelper
def
event_note_title_html
(
event
)
def
event_note_title_html
(
event
)
if
event
.
note_target
if
event
.
note_target
link_prefix
=
link_prefix
=
event
.
note_target
.
class
.
reference_prefix
if
event
.
note_target
.
class
.
name
==
"Issue"
"#"
else
"!"
end
if
event
.
note_commit?
if
event
.
note_commit?
link_to
(
link_to
(
...
@@ -175,11 +170,11 @@ module EventsHelper
...
@@ -175,11 +170,11 @@ module EventsHelper
link_to
(
namespace_project_snippet_path
(
event
.
project
.
namespace
,
link_to
(
namespace_project_snippet_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
project
,
event
.
note_target
))
do
event
.
note_target
))
do
"
#{
event
.
note_target_type
}
#{
link_prefix
}#{
truncate
event
.
note_target_id
}
"
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
end
end
else
else
link_to
event_note_target_path
(
event
)
do
link_to
event_note_target_path
(
event
)
do
"
#{
event
.
note_target_type
}
#{
link_prefix
}#{
truncate
event
.
note_target_iid
}
"
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
end
end
end
end
else
else
...
...
app/views/events/event/_common.html.haml
View file @
fbe6b8ee
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
event_action_name
(
event
)
=
event_action_name
(
event
)
-
if
event
.
target
-
if
event
.
target
%strong
=
link_to
"
!
#{
event
.
target_iid
}
"
,
[
event
.
project
.
namespace
.
becomes
(
Namespace
),
event
.
project
,
event
.
target
]
%strong
=
link_to
"
#{
event
.
target
.
to_reference
}
"
,
[
event
.
project
.
namespace
.
becomes
(
Namespace
),
event
.
project
,
event
.
target
]
=
event_preposition
(
event
)
=
event_preposition
(
event
)
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
fbe6b8ee
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
=
note_count
=
note_count
.merge-request-info
.merge-request-info
\
#{
merge_request
.
iid
}
·
\
#{
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
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
fbe6b8ee
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.status-box
{
class:
status_box_class
(
@merge_request
)
}
.status-box
{
class:
status_box_class
(
@merge_request
)
}
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
%span
.identifier
%span
.identifier
Merge Request
!
#{
@merge_request
.
iid
}
Merge Request
#{
@merge_request
.
to_reference
}
%span
.creator
%span
.creator
·
·
by
#{
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
)
}
by
#{
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
)
}
...
...
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