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
Léo-Paul Géneau
gitlab-ce
Commits
09494ff4
Commit
09494ff4
authored
Mar 15, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'todos-title-attr' into 'master'
Set link title for todos. Closes #14042 See merge request !3161
parents
b5a47c0a
dc3c9f5a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+3
-3
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+1
-1
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+1
-1
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+1
-1
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+1
-1
No files found.
app/helpers/events_helper.rb
View file @
09494ff4
...
@@ -3,7 +3,7 @@ module EventsHelper
...
@@ -3,7 +3,7 @@ module EventsHelper
author
=
event
.
author
author
=
event
.
author
if
author
if
author
link_to
author
.
name
,
user_path
(
author
.
username
)
link_to
author
.
name
,
user_path
(
author
.
username
)
,
title:
h
(
author
.
name
)
else
else
event
.
author_name
event
.
author_name
end
end
...
@@ -159,7 +159,7 @@ module EventsHelper
...
@@ -159,7 +159,7 @@ module EventsHelper
link_to
(
link_to
(
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_commit_id
,
event
.
note_commit_id
,
anchor:
dom_id
(
event
.
target
)),
anchor:
dom_id
(
event
.
target
)
,
title:
h
(
event
.
target_title
)
),
class:
"commit_short_id"
class:
"commit_short_id"
)
do
)
do
"
#{
event
.
note_target_type
}
#{
event
.
note_short_commit_id
}
"
"
#{
event
.
note_target_type
}
#{
event
.
note_short_commit_id
}
"
...
@@ -167,7 +167,7 @@ module EventsHelper
...
@@ -167,7 +167,7 @@ module EventsHelper
elsif
event
.
note_project_snippet?
elsif
event
.
note_project_snippet?
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
)
,
title:
h
(
event
.
project
.
name
)
)
do
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
end
end
else
else
...
...
app/helpers/projects_helper.rb
View file @
09494ff4
...
@@ -8,7 +8,7 @@ module ProjectsHelper
...
@@ -8,7 +8,7 @@ module ProjectsHelper
end
end
def
link_to_project
(
project
)
def
link_to_project
(
project
)
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
do
link_to
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
,
title:
h
(
project
.
name
)
do
title
=
content_tag
(
:span
,
project
.
name
,
class:
'project-name'
)
title
=
content_tag
(
:span
,
project
.
name
,
class:
'project-name'
)
if
project
.
namespace
if
project
.
namespace
...
...
app/helpers/todos_helper.rb
View file @
09494ff4
...
@@ -16,7 +16,7 @@ module TodosHelper
...
@@ -16,7 +16,7 @@ module TodosHelper
def
todo_target_link
(
todo
)
def
todo_target_link
(
todo
)
target
=
todo
.
target_type
.
titleize
.
downcase
target
=
todo
.
target_type
.
titleize
.
downcase
link_to
"
#{
target
}
#{
todo
.
target
.
to_reference
}
"
,
todo_target_path
(
todo
)
link_to
"
#{
target
}
#{
todo
.
target
.
to_reference
}
"
,
todo_target_path
(
todo
)
,
{
title:
h
(
todo
.
target
.
title
)
}
end
end
def
todo_target_path
(
todo
)
def
todo_target_path
(
todo
)
...
...
app/views/events/_commit.html.haml
View file @
09494ff4
%li
.commit
%li
.commit
.commit-row-title
.commit-row-title
=
link_to
truncate_sha
(
commit
[
:id
]),
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
=
link_to
truncate_sha
(
commit
[
:id
]),
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
,
title:
truncate_sha
(
commit
[
:id
])
·
·
=
markdown
event_commit_title
(
commit
[
:message
]),
project:
project
,
pipeline: :single_line
=
markdown
event_commit_title
(
commit
[
:message
]),
project:
project
,
pipeline: :single_line
app/views/events/_event_last_push.html.haml
View file @
09494ff4
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.event-last-push
.event-last-push
.event-last-push-text
.event-last-push-text
%span
You pushed to
%span
You pushed to
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
do
=
link_to
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
,
title:
h
(
event
.
project
.
name
)
do
%strong
=
event
.
ref_name
%strong
=
event
.
ref_name
%span
at
%span
at
%strong
=
link_to_project
event
.
project
%strong
=
link_to_project
event
.
project
...
...
app/views/events/event/_push.html.haml
View file @
09494ff4
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
%strong
=
event
.
ref_name
%strong
=
event
.
ref_name
-
else
-
else
%strong
%strong
=
link_to
event
.
ref_name
,
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
=
link_to
event
.
ref_name
,
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
,
title:
h
(
event
.
target_title
)
at
at
=
link_to_project
event
.
project
=
link_to_project
event
.
project
...
...
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