favicon updated

diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png
deleted file mode 100644 (file)
index 310003b..0000000
Binary files a/app/assets/images/favicon.png and /dev/null differ

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index f013f12..cb0d6b9 100644 (file)
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags

diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 3296466..882195a 100644 (file)
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags

diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 5c4f59d..6eeecb2 100644 (file)
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags

diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 3dbb69c..5de97b5 100644 (file)
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -3,6 +3,7 @@
   %head
     %title
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = favicon_link_tag 'favicon.ico'
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))

diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29..057f74a 100644 (file)
Binary files a/public/favicon.ico and b/public/favicon.ico differ