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
Jérome Perrin
gitlab-ce
Commits
138aa81e
Commit
138aa81e
authored
Feb 18, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get contributed projects only if push event exists
parent
93dde8a3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/models/user.rb
app/models/user.rb
+1
-0
app/views/users/calendar.html.haml
app/views/users/calendar.html.haml
+1
-1
No files found.
app/models/user.rb
View file @
138aa81e
...
@@ -610,6 +610,7 @@ class User < ActiveRecord::Base
...
@@ -610,6 +610,7 @@ class User < ActiveRecord::Base
def
contributed_projects_ids
def
contributed_projects_ids
Event
.
where
(
author_id:
self
).
Event
.
where
(
author_id:
self
).
code_push
.
reorder
(
project_id: :desc
).
reorder
(
project_id: :desc
).
select
(
'DISTINCT(project_id)'
).
select
(
'DISTINCT(project_id)'
).
map
(
&
:project_id
)
map
(
&
:project_id
)
...
...
app/views/users/calendar.html.haml
View file @
138aa81e
%h4
Calendar
%h4
C
ommits c
alendar
#cal-heatmap
.calendar
#cal-heatmap
.calendar
:javascript
:javascript
new
calendar
(
new
calendar
(
...
...
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