BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ca9ae8bf
Commit
ca9ae8bf
authored
Oct 27, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add email to user related queries so it can be used for displaying avatar in the UI
parent
32679232
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
6 deletions
+21
-6
events_controller.rb
...controllers/projects/cycle_analytics/events_controller.rb
+1
-1
events.rb
lib/gitlab/cycle_analytics/events.rb
+0
-1
events_fetcher.rb
lib/gitlab/cycle_analytics/events_fetcher.rb
+4
-4
events_spec.rb
spec/lib/gitlab/cycle_analytics/events_spec.rb
+16
-0
No files found.
app/controllers/projects/cycle_analytics/events_controller.rb
View file @
ca9ae8bf
class
Projects
::
CycleAnalytics
::
EventsController
<
Projects
::
ApplicationController
#before_action :authorize_read_cycle_analytics!
#
before_action :authorize_read_cycle_analytics!
def
issue
render_events
(
events
.
issue_events
)
...
...
lib/gitlab/cycle_analytics/events.rb
View file @
ca9ae8bf
...
...
@@ -10,7 +10,6 @@ module Gitlab
end
# TODO: backend pagination - specially for commits, etc...
# TODO figure out what the frontend needs for displaying the avatar
def
issue_events
@fetcher
.
fetch
(
stage: :issue
).
each
{
|
event
|
parse_event
(
event
)
}
...
...
lib/gitlab/cycle_analytics/events_fetcher.rb
View file @
ca9ae8bf
...
...
@@ -8,7 +8,7 @@ module Gitlab
start_time_attrs:
issue_table
[
:created_at
],
end_time_attrs:
[
issue_metrics_table
[
:first_associated_with_milestone_at
],
issue_metrics_table
[
:first_added_to_board_at
]],
projections:
[
issue_table
[
:title
],
issue_table
[
:iid
],
issue_table
[
:created_at
],
user_table
[
:name
]]
projections:
[
issue_table
[
:title
],
issue_table
[
:iid
],
issue_table
[
:created_at
],
user_table
[
:name
]
,
user_table
[
:email
]
]
},
plan:
{
start_time_attrs:
issue_metrics_table
[
:first_associated_with_milestone_at
],
...
...
@@ -19,7 +19,7 @@ module Gitlab
code:
{
start_time_attrs:
issue_metrics_table
[
:first_mentioned_in_commit_at
],
end_time_attrs:
mr_table
[
:created_at
],
projections:
[
mr_table
[
:title
],
mr_table
[
:iid
],
mr_table
[
:created_at
],
user_table
[
:name
]],
projections:
[
mr_table
[
:title
],
mr_table
[
:iid
],
mr_table
[
:created_at
],
user_table
[
:name
]
,
user_table
[
:email
]
],
order:
mr_table
[
:created_at
]
},
test:
{
...
...
@@ -31,7 +31,7 @@ module Gitlab
review:
{
start_time_attrs:
mr_table
[
:created_at
],
end_time_attrs:
mr_metrics_table
[
:merged_at
],
projections:
[
mr_table
[
:title
],
mr_table
[
:iid
],
mr_table
[
:created_at
],
user_table
[
:name
]]
projections:
[
mr_table
[
:title
],
mr_table
[
:iid
],
mr_table
[
:created_at
],
user_table
[
:name
]
,
user_table
[
:email
]
]
},
staging:
{
start_time_attrs:
mr_metrics_table
[
:merged_at
],
...
...
@@ -41,7 +41,7 @@ module Gitlab
production:
{
start_time_attrs:
issue_table
[
:created_at
],
end_time_attrs:
mr_metrics_table
[
:first_deployed_to_production_at
],
projections:
[
issue_table
[
:title
],
issue_table
[
:iid
],
issue_table
[
:created_at
],
user_table
[
:name
]]
projections:
[
issue_table
[
:title
],
issue_table
[
:iid
],
issue_table
[
:created_at
],
user_table
[
:name
]
,
user_table
[
:email
]
]
},
}.
freeze
...
...
spec/lib/gitlab/cycle_analytics/events_spec.rb
View file @
ca9ae8bf
...
...
@@ -30,6 +30,10 @@ describe Gitlab::CycleAnalytics::Events do
expect
(
subject
.
issue_events
.
first
[
'created_at'
]).
to
end_with
(
'ago'
)
end
it
"has the author's email"
do
expect
(
subject
.
issue_events
.
first
[
'email'
]).
to
eq
(
context
.
author
.
email
)
end
it
"has the author's name"
do
expect
(
subject
.
issue_events
.
first
[
'name'
]).
to
eq
(
context
.
author
.
name
)
end
...
...
@@ -70,6 +74,10 @@ describe Gitlab::CycleAnalytics::Events do
expect
(
subject
.
code_events
.
first
[
'created_at'
]).
to
end_with
(
'ago'
)
end
it
"has the author's email"
do
expect
(
subject
.
code_events
.
first
[
'email'
]).
to
eq
(
context
.
author
.
email
)
end
it
"has the author's name"
do
expect
(
subject
.
code_events
.
first
[
'name'
]).
to
eq
(
context
.
author
.
name
)
end
...
...
@@ -118,6 +126,10 @@ describe Gitlab::CycleAnalytics::Events do
expect
(
subject
.
review_events
.
first
[
'created_at'
]).
to
end_with
(
'ago'
)
end
it
"has the author's email"
do
expect
(
subject
.
review_events
.
first
[
'email'
]).
to
eq
(
MergeRequest
.
first
.
author
.
email
)
end
it
"has the author's name"
do
expect
(
subject
.
review_events
.
first
[
'name'
]).
to
eq
(
MergeRequest
.
first
.
author
.
name
)
end
...
...
@@ -173,6 +185,10 @@ describe Gitlab::CycleAnalytics::Events do
expect
(
subject
.
production_events
.
first
[
'created_at'
]).
to
end_with
(
'ago'
)
end
it
"has the author's email"
do
expect
(
subject
.
production_events
.
first
[
'email'
]).
to
eq
(
context
.
author
.
email
)
end
it
"has the author's name"
do
expect
(
subject
.
production_events
.
first
[
'name'
]).
to
eq
(
context
.
author
.
name
)
end
...
...
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