Skip to content

Bug fixed for org avatar caused by #1049 #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2017

Conversation

lunny
Copy link
Member

@lunny lunny commented Feb 26, 2017

No description provided.

@lunny lunny added the type/bug label Feb 26, 2017
@lunny lunny added this to the 1.1.0 milestone Feb 26, 2017
@appleboy
Copy link
Member

LGTM

@tboerger tboerger added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 26, 2017
models/user.go Outdated
@@ -324,12 +324,12 @@ func (u *User) RelAvatarLink() string {

switch {
case u.UseCustomAvatar:
if !com.IsExist(u.CustomAvatarPath()) {
if !com.IsExist(u.CustomAvatarPath()) || !com.IsFile(u.CustomAvatarPath()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can just have !com.IsFile(u.CustomAvatarPath()); com.IsFile(..) will return false if the file does not exist.

@ethantkoenig
Copy link
Member

One small tweak, otherwise LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 26, 2017
Copy link
Member

@ethantkoenig ethantkoenig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lunny
Copy link
Member Author

lunny commented Feb 27, 2017

let L-G-T-M work

@lunny lunny merged commit 522f194 into go-gitea:master Feb 27, 2017
@lunny lunny deleted the lunny/fix_org_avatar branch February 27, 2017 00:42
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants