mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 17:46:07 +10:00
Get contributed projects only if push event exists
Conflicts: app/models/user.rb
This commit is contained in:
+10
-2
@@ -255,7 +255,7 @@ class User < ActiveRecord::Base
|
||||
counter = 0
|
||||
base = username
|
||||
while User.by_login(username).present? || Namespace.by_path(username).present?
|
||||
counter += 1
|
||||
counter += 1
|
||||
username = "#{base}#{counter}"
|
||||
end
|
||||
|
||||
@@ -459,7 +459,7 @@ class User < ActiveRecord::Base
|
||||
|
||||
def set_notification_email
|
||||
if self.notification_email.blank? || !self.all_emails.include?(self.notification_email)
|
||||
self.notification_email = self.email
|
||||
self.notification_email = self.email
|
||||
end
|
||||
end
|
||||
|
||||
@@ -607,4 +607,12 @@ class User < ActiveRecord::Base
|
||||
def oauth_authorized_tokens
|
||||
Doorkeeper::AccessToken.where(resource_owner_id: self.id, revoked_at: nil)
|
||||
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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%h4 Calendar
|
||||
%h4 Commits calendar
|
||||
#cal-heatmap.calendar
|
||||
:javascript
|
||||
new calendar(
|
||||
|
||||
Reference in New Issue
Block a user