Commit 644135b9 authored by Rémy Coutable's avatar Rémy Coutable

Revert "Moving 400 lines of code"

This reverts commit 1915c9f0.
parent ffba5ce9
...@@ -2182,306 +2182,5 @@ class Project < ActiveRecord::Base ...@@ -2182,306 +2182,5 @@ class Project < ActiveRecord::Base
else else
check_access.call check_access.call
end end
end end
end end
...@@ -441,20 +441,6 @@ class User < ActiveRecord::Base ...@@ -441,20 +441,6 @@ class User < ActiveRecord::Base
[:ghost] [:ghost]
end 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? def internal?
self.class.internal_attributes.any? { |a| self[a] } self.class.internal_attributes.any? { |a| self[a] }
end end
...@@ -859,6 +845,19 @@ class User < ActiveRecord::Base ...@@ -859,6 +845,19 @@ class User < ActiveRecord::Base
project.project_member(self) project.project_member(self)
end 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? def temp_oauth_email?
email.start_with?('temp-email-for-oauth') email.start_with?('temp-email-for-oauth')
......
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