Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
7a84dcf2
Commit
7a84dcf2
authored
Jan 25, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-default-project-icon' into 'master'
Remove default project icon See merge request !1434
parents
89f9ae77
3588a07b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
4 deletions
+0
-4
app/assets/images/no_project_icon.png
app/assets/images/no_project_icon.png
+0
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+0
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+0
-2
No files found.
app/assets/images/no_project_icon.png
deleted
100644 → 0
View file @
89f9ae77
3.31 KB
app/helpers/application_helper.rb
View file @
7a84dcf2
...
@@ -56,8 +56,6 @@ module ApplicationHelper
...
@@ -56,8 +56,6 @@ module ApplicationHelper
image_tag
project
.
avatar
.
url
,
options
image_tag
project
.
avatar
.
url
,
options
elsif
project
.
avatar_in_git
elsif
project
.
avatar_in_git
image_tag
project_avatar_path
(
project
),
options
image_tag
project_avatar_path
(
project
),
options
elsif
options
[
:only_uploaded
]
image_tag
'/assets/no_project_icon.png'
,
options
else
# generated icon
else
# generated icon
project_identicon
(
project
,
options
)
project_identicon
(
project
,
options
)
end
end
...
...
app/views/projects/edit.html.haml
View file @
7a84dcf2
...
@@ -89,8 +89,6 @@
...
@@ -89,8 +89,6 @@
.col-sm-10
.col-sm-10
-
if
@project
.
avatar?
-
if
@project
.
avatar?
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar s160'
)
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar s160'
)
-
else
=
project_icon
(
@project
.
to_param
,
alt:
''
,
class:
'avatar s160'
,
only_uploaded:
true
)
%p
.light
%p
.light
-
if
@project
.
avatar_in_git
-
if
@project
.
avatar_in_git
Project avatar in repository:
#{
@project
.
avatar_in_git
}
Project avatar in repository:
#{
@project
.
avatar_in_git
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment