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
2c358a05
Commit
2c358a05
authored
Apr 20, 2017
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add username to activity atom feed (!10802)
parent
43fb9279
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
app/models/event.rb
app/models/event.rb
+1
-1
app/views/events/_event.atom.builder
app/views/events/_event.atom.builder
+1
-0
changelogs/unreleased/add-username-to-activity-feed.yml
changelogs/unreleased/add-username-to-activity-feed.yml
+4
-0
No files found.
app/models/event.rb
View file @
2c358a05
...
@@ -16,7 +16,7 @@ class Event < ActiveRecord::Base
...
@@ -16,7 +16,7 @@ class Event < ActiveRecord::Base
RESET_PROJECT_ACTIVITY_INTERVAL
=
1
.
hour
RESET_PROJECT_ACTIVITY_INTERVAL
=
1
.
hour
delegate
:name
,
:email
,
:public_email
,
to: :author
,
prefix:
true
,
allow_nil:
true
delegate
:name
,
:email
,
:public_email
,
:username
,
to: :author
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :issue
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :issue
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :merge_request
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :merge_request
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :note
,
prefix:
true
,
allow_nil:
true
delegate
:title
,
to: :note
,
prefix:
true
,
allow_nil:
true
...
...
app/views/events/_event.atom.builder
View file @
2c358a05
...
@@ -8,6 +8,7 @@ xml.entry do
...
@@ -8,6 +8,7 @@ xml.entry do
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
xml.author do
xml.author do
xml.username event.author_username
xml.name event.author_name
xml.name event.author_name
xml.email event.author_public_email
xml.email event.author_public_email
end
end
...
...
changelogs/unreleased/add-username-to-activity-feed.yml
0 → 100644
View file @
2c358a05
---
title
:
Add username to activity atom feed
merge_request
:
10802
author
:
winniehell
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