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
8bf7a64b
Commit
8bf7a64b
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
Conflicts: app/models/user.rb
parent
87bf35df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
app/models/user.rb
app/models/user.rb
+10
-2
app/views/users/calendar.html.haml
app/views/users/calendar.html.haml
+1
-1
No files found.
app/models/user.rb
View file @
8bf7a64b
...
@@ -607,4 +607,12 @@ class User < ActiveRecord::Base
...
@@ -607,4 +607,12 @@ class User < ActiveRecord::Base
def
oauth_authorized_tokens
def
oauth_authorized_tokens
Doorkeeper
::
AccessToken
.
where
(
resource_owner_id:
self
.
id
,
revoked_at:
nil
)
Doorkeeper
::
AccessToken
.
where
(
resource_owner_id:
self
.
id
,
revoked_at:
nil
)
end
end
def
contributed_projects_ids
Event
.
where
(
author_id:
self
).
code_push
.
reorder
(
project_id: :desc
).
select
(
'DISTINCT(project_id)'
).
map
(
&
:project_id
)
end
end
end
app/views/users/calendar.html.haml
View file @
8bf7a64b
%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