diff options
| -rw-r--r-- | app/assets/images/favicon.png | bin | 338 -> 0 bytes | |||
| -rw-r--r-- | app/views/layouts/admin.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/profile.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 1 | ||||
| -rw-r--r-- | public/favicon.ico | bin | 0 -> 1150 bytes |
6 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png Binary files differdeleted file mode 100644 index 310003b8dec..00000000000 --- a/app/assets/images/favicon.png +++ /dev/null diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index f013f12a2f4..cb0d6b932b0 100644 --- 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 32964663766..882195ae58d 100644 --- 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 5c4f59dd20f..6eeecb294be 100644 --- 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 3dbb69c4ea9..5de97b523d9 100644 --- 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 Binary files differindex e69de29bb2d..057f74ac7ab 100644 --- a/public/favicon.ico +++ b/public/favicon.ico |
