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
Tatuya Kamada
gitlab-ce
Commits
aff5e73f
Commit
aff5e73f
authored
Feb 23, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed # to ! on merge requests on activity view
Closes #9082
parent
7d41e4dc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+9
-2
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.
app/helpers/events_helper.rb
View file @
aff5e73f
...
@@ -155,6 +155,13 @@ module EventsHelper
...
@@ -155,6 +155,13 @@ module EventsHelper
def
event_note_title_html
(
event
)
def
event_note_title_html
(
event
)
if
event
.
note_target
if
event
.
note_target
link_prefix
=
if
event
.
note_target
.
class
.
name
==
"Issue"
"#"
else
"!"
end
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
,
...
@@ -168,11 +175,11 @@ module EventsHelper
...
@@ -168,11 +175,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
}
#
#{
truncate
event
.
note_target_id
}
"
"
#{
event
.
note_target_type
}
#
{
link_prefix
}
#{
truncate
event
.
note_target_id
}
"
end
end
else
else
link_to
event_note_target_path
(
event
)
do
link_to
event_note_target_path
(
event
)
do
"
#{
event
.
note_target_type
}
#
#{
truncate
event
.
note_target_iid
}
"
"
#{
event
.
note_target_type
}
#
{
link_prefix
}
#{
truncate
event
.
note_target_iid
}
"
end
end
end
end
else
else
...
...
app/views/events/event/_common.html.haml
View file @
aff5e73f
...
@@ -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_iid
}
"
,
[
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 @
aff5e73f
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
=
note_count
=
note_count
.merge-request-info
.merge-request-info
\#
#
{merge_request.iid}
·
\
#{
merge_request
.
iid
}
·
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 @
aff5e73f
...
@@ -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
.
iid
}
%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