Read about our upcoming Code of Conduct on this issue

Commit 28295f33 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Revert "Moving 400 lines of code"

This reverts commit 1915c9f0cf1ec3e836c02ba57c97e5a9a61d487b.
parent 879038b6389d
......@@ -2182,306 +2182,5 @@ def fetch_branch_allows_collaboration?(user, branch_name)
else
check_access.call
end
end
end
......@@ -441,20 +441,6 @@ def self.internal_attributes
[: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
......@@ -859,6 +845,19 @@ def can_leave_project?(project)
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')
......
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