Skip to content
Snippets Groups Projects
Unverified Commit 644135b9 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Revert "Moving 400 lines of code"

This reverts commit 1915c9f0.
parent ffba5ce9
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -2182,306 +2182,5 @@ class Project < ActiveRecord::Base
else
check_access.call
end
end
end
Loading
Loading
@@ -441,20 +441,6 @@ class User < ActiveRecord::Base
[:ghost]
end
 
def full_website_url
return "http://#{website_url}" if website_url !~ %r{\Ahttps?://}
website_url
end
def short_website_url
website_url.sub(%r{\Ahttps?://}, '')
end
def all_ssh_keys
keys.map(&:publishable_key)
end
def internal?
self.class.internal_attributes.any? { |a| self[a] }
end
Loading
Loading
@@ -859,6 +845,19 @@ class User < ActiveRecord::Base
project.project_member(self)
end
 
def full_website_url
return "http://#{website_url}" if website_url !~ %r{\Ahttps?://}
website_url
end
def short_website_url
website_url.sub(%r{\Ahttps?://}, '')
end
def all_ssh_keys
keys.map(&:publishable_key)
end
 
def temp_oauth_email?
email.start_with?('temp-email-for-oauth')
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment