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
1a04a51b
Commit
1a04a51b
authored
8 years ago
by
Airat Shigapov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix events order in user contributions API
parent
c99d12e5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
lib/api/users.rb
lib/api/users.rb
+2
-1
No files found.
lib/api/users.rb
View file @
1a04a51b
...
@@ -333,10 +333,11 @@ module API
...
@@ -333,10 +333,11 @@ module API
user
=
User
.
find_by
(
id:
declared
(
params
).
id
)
user
=
User
.
find_by
(
id:
declared
(
params
).
id
)
not_found!
(
'User'
)
unless
user
not_found!
(
'User'
)
unless
user
events
=
user
.
recent_
events
.
events
=
user
.
events
.
merge
(
ProjectsFinder
.
new
.
execute
(
current_user
)).
merge
(
ProjectsFinder
.
new
.
execute
(
current_user
)).
references
(
:project
).
references
(
:project
).
with_associations
.
with_associations
.
recent
.
page
(
params
[
:page
])
page
(
params
[
:page
])
present
paginate
(
events
),
with:
Entities
::
Event
present
paginate
(
events
),
with:
Entities
::
Event
...
...
This diff is collapsed.
Click to expand it.
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