Updates based on MR comments

2 files changed, 16 insertions, 11 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cfdb95e2498..264f21a1466 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -41,12 +41,15 @@ module ApplicationHelper
       end
 
     if project.avatar_url
-      if project.private?
-        options[:use_original_source] = true
-        image_tag project.avatar_url(use_asset_path: false), options
-      else
-        image_tag project.avatar_url, options
-      end
+      #if project.private?
+      #  options[:use_original_source] = true
+      #  image_tag project.avatar_url(use_asset_path: false), options
+      #else
+      #  image_tag project.avatar_url, options
+      #end
+
+      image_tag project.avatar_url(use_asset_path: project.public?), options
+
     else # generated icon
       project_identicon(project, options)
     end
diff --git a/app/helpers/lazy_image_tag_helper.rb b/app/helpers/lazy_image_tag_helper.rb
index 2b5e9a9ef57..c150c2927a9 100644
--- a/app/helpers/lazy_image_tag_helper.rb
+++ b/app/helpers/lazy_image_tag_helper.rb
@@ -9,11 +9,13 @@ module LazyImageTagHelper
 
     unless options.delete(:lazy) == false
       options[:data] ||= {}
-      options[:data][:src] = if options.delete(:use_original_source)
-                               source
-                             else
-                               path_to_image(source)
-                             end
+      #options[:data][:src] = if options.delete(:use_original_source)
+      #                         source
+      #                       else
+      #                         path_to_image(source)
+      #                       end
+
+      options[:data][:src] = path_to_image(source)
 
       options[:class] ||= ""
       options[:class] << " lazy"