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
b026473a
Commit
b026473a
authored
Nov 25, 2019
by
Roger Meier
Committed by
Natalia Tepluhina
Nov 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tagger within tag view
parent
ec8fb7cb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
4 deletions
+37
-4
app/helpers/git_helper.rb
app/helpers/git_helper.rb
+3
-1
app/views/projects/tags/_tag.atom.builder
app/views/projects/tags/_tag.atom.builder
+1
-1
app/views/projects/tags/_tag.html.haml
app/views/projects/tags/_tag.html.haml
+1
-1
app/views/projects/tags/show.html.haml
app/views/projects/tags/show.html.haml
+23
-1
changelogs/unreleased/feat-tagger.yml
changelogs/unreleased/feat-tagger.yml
+5
-0
lib/gitlab/git/tag.rb
lib/gitlab/git/tag.rb
+4
-0
No files found.
app/helpers/git_helper.rb
View file @
b026473a
# frozen_string_literal: true
# frozen_string_literal: true
module
GitHelper
module
GitHelper
def
strip_
gpg_
signature
(
text
)
def
strip_signature
(
text
)
text
.
gsub
(
/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m
,
""
)
text
.
gsub
(
/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m
,
""
)
text
.
gsub
(
/-----BEGIN PGP MESSAGE-----(.*)-----END PGP MESSAGE-----/m
,
""
)
text
.
gsub
(
/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m
,
""
)
end
end
def
short_sha
(
text
)
def
short_sha
(
text
)
...
...
app/views/projects/tags/_tag.atom.builder
View file @
b026473a
...
@@ -7,7 +7,7 @@ if commit
...
@@ -7,7 +7,7 @@ if commit
xml.id tag_url
xml.id tag_url
xml.link href: tag_url
xml.link href: tag_url
xml.title truncate(tag.name, length: 80)
xml.title truncate(tag.name, length: 80)
xml.summary strip_
gpg_
signature(tag.message)
xml.summary strip_signature(tag.message)
xml.content markdown_field(release, :description), type: 'html'
xml.content markdown_field(release, :description), type: 'html'
xml.updated release.updated_at.xmlschema if release
xml.updated release.updated_at.xmlschema if release
xml.media :thumbnail, width: '40', height: '40', url: image_url(avatar_icon_for_email(commit.author_email))
xml.media :thumbnail, width: '40', height: '40', url: image_url(avatar_icon_for_email(commit.author_email))
...
...
app/views/projects/tags/_tag.html.haml
View file @
b026473a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
-
if
tag
.
message
.
present?
-
if
tag
.
message
.
present?
=
strip_
gpg_
signature
(
tag
.
message
)
=
strip_signature
(
tag
.
message
)
-
if
commit
-
if
commit
.block-truncated
.block-truncated
...
...
app/views/projects/tags/show.html.haml
View file @
b026473a
-
user
=
user_email
=
nil
-
if
@tag
.
tagger
-
user_email
=
@tag
.
tagger
.
email
-
user
=
User
.
find_by_any_email
(
user_email
)
-
add_to_breadcrumbs
s_
(
'TagsPage|Tags'
),
project_tags_path
(
@project
)
-
add_to_breadcrumbs
s_
(
'TagsPage|Tags'
),
project_tags_path
(
@project
)
-
breadcrumb_title
@tag
.
name
-
breadcrumb_title
@tag
.
name
-
page_title
@tag
.
name
,
s_
(
'TagsPage|Tags'
)
-
page_title
@tag
.
name
,
s_
(
'TagsPage|Tags'
)
...
@@ -11,6 +15,24 @@
...
@@ -11,6 +15,24 @@
-
if
protected_tag?
(
@project
,
@tag
)
-
if
protected_tag?
(
@project
,
@tag
)
%span
.badge.badge-success
%span
.badge.badge-success
=
s_
(
'TagsPage|protected'
)
=
s_
(
'TagsPage|protected'
)
-
if
user
=
link_to
user_path
(
user
)
do
%div
=
user_avatar_without_link
(
user:
user
,
size:
32
,
css_class:
"mt-1 mb-1"
)
%div
%strong
=
user
.
name
%div
=
user
.
to_reference
-
elsif
user_email
=
mail_to
user_email
do
%div
=
user_avatar_without_link
(
user_email:
user_email
,
size:
32
,
css_class:
"mt-1 mb-1"
)
%div
{
:class
=>
"clearfix"
}
%strong
=
user_email
-
if
@commit
-
if
@commit
=
render
'projects/branches/commit'
,
commit:
@commit
,
project:
@project
=
render
'projects/branches/commit'
,
commit:
@commit
,
project:
@project
-
else
-
else
...
@@ -33,7 +55,7 @@
...
@@ -33,7 +55,7 @@
-
if
@tag
.
message
.
present?
-
if
@tag
.
message
.
present?
%pre
.wrap
%pre
.wrap
=
strip_
gpg_
signature
(
@tag
.
message
)
=
strip_signature
(
@tag
.
message
)
.append-bottom-default.prepend-top-default
.append-bottom-default.prepend-top-default
-
if
@release
.
description
.
present?
-
if
@release
.
description
.
present?
...
...
changelogs/unreleased/feat-tagger.yml
0 → 100644
View file @
b026473a
---
title
:
add tagger within tag view
merge_request
:
19681
author
:
Roger Meier
type
:
added
lib/gitlab/git/tag.rb
View file @
b026473a
...
@@ -62,6 +62,10 @@ module Gitlab
...
@@ -62,6 +62,10 @@ module Gitlab
encode!
@message
encode!
@message
end
end
def
tagger
@raw_tag
.
tagger
end
private
private
def
message_from_gitaly_tag
def
message_from_gitaly_tag
...
...
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