BigW Consortium Gitlab

Commit 8bf7a64b by Dmitriy Zaporozhets

Get contributed projects only if push event exists

Conflicts: app/models/user.rb
parent 87bf35df
...@@ -255,7 +255,7 @@ class User < ActiveRecord::Base ...@@ -255,7 +255,7 @@ class User < ActiveRecord::Base
counter = 0 counter = 0
base = username base = username
while User.by_login(username).present? || Namespace.by_path(username).present? while User.by_login(username).present? || Namespace.by_path(username).present?
counter += 1 counter += 1
username = "#{base}#{counter}" username = "#{base}#{counter}"
end end
...@@ -459,7 +459,7 @@ class User < ActiveRecord::Base ...@@ -459,7 +459,7 @@ class User < ActiveRecord::Base
def set_notification_email def set_notification_email
if self.notification_email.blank? || !self.all_emails.include?(self.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
end end
...@@ -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
%h4 Calendar %h4 Commits calendar
#cal-heatmap.calendar #cal-heatmap.calendar
:javascript :javascript
new calendar( new calendar(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment