diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-25 07:36:57 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-25 07:36:57 +0000 |
| commit | 7a84dcf2226f4b9be0c1ded92c91c2c6ef823970 (patch) | |
| tree | c426e245a3df0782a2c0f86d2e752cddecb0a333 | |
| parent | 89f9ae77e2c3238c21d25ce9bfe57d6a466d71c6 (diff) | |
| parent | 3588a07b8379c98029598cac8050a1f90fd9c354 (diff) | |
| download | gitlab-ce-7a84dcf2226f4b9be0c1ded92c91c2c6ef823970.tar.gz | |
Merge branch 'remove-default-project-icon' into 'master'
Remove default project icon
See merge request !1434
| -rw-r--r-- | app/assets/images/no_project_icon.png | bin | 3387 -> 0 bytes | |||
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/images/no_project_icon.png b/app/assets/images/no_project_icon.png Binary files differdeleted file mode 100644 index 8e9529c67ec..00000000000 --- a/app/assets/images/no_project_icon.png +++ /dev/null diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f253ae91306..104ae517a08 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -56,8 +56,6 @@ module ApplicationHelper image_tag project.avatar.url, options elsif project.avatar_in_git image_tag project_avatar_path(project), options - elsif options[:only_uploaded] - image_tag '/assets/no_project_icon.png', options else # generated icon project_identicon(project, options) end diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 28de1a778a7..fde9dc45fc6 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -89,8 +89,6 @@ .col-sm-10 - if @project.avatar? = project_icon(@project.to_param, alt: '', class: 'avatar s160') - - else - = project_icon(@project.to_param, alt: '', class: 'avatar s160', only_uploaded: true) %p.light - if @project.avatar_in_git Project avatar in repository: #{ @project.avatar_in_git } |
