Merge pull request #2538 from jouve/app_helper

clean application_helper a bit

Merge pull request #2538 from jouve/app_helper
clean application_helper a bit
Dmitriy Zaporozhets
2 parents 369dbaf3 8a3bbbdb
Showing 1 changed file with 1 additions and 9 deletions Show diff stats
app/helpers/application_helper.rb
@@ -39,18 +39,10 @@ module ApplicationHelper
     else
       gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
       user_email.strip!
-      sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size})
+      sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
     end
   end
  
-  def request_protocol
-    request.ssl? ? "https" : "http"
-  end
-
-  def web_app_url
-    "#{request_protocol}://#{Gitlab.config.gitlab.host}/"
-  end
-
   def last_commit(project)
     if project.repo_exists?
       time_ago_in_words(project.repository.commit.committed_date) + " ago"
...	...	@@ -39,18 +39,10 @@ module ApplicationHelper
39	39	else
40	40	gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
41	41	user_email.strip!
42		- sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size})
	42	+ sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
43	43	end
44	44	end
45	45
46		- def request_protocol
47		- request.ssl? ? "https" : "http"
48		- end
49		-
50		- def web_app_url
51		- "#{request_protocol}://#{Gitlab.config.gitlab.host}/"
52		- end
53		-
54	46	def last_commit(project)
55	47	if project.repo_exists?
56	48	time_ago_in_words(project.repository.commit.committed_date) + " ago"
...	...