summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author无闻 <joe2010xtmf@163.com>2014-08-04 13:46:23 -0400
committer无闻 <joe2010xtmf@163.com>2014-08-04 13:46:23 -0400
commit5f84e8f4fffa103438e3d1af9dfe3ad8f669e4e5 (patch)
tree74d2537b581ec04cb0313822e3561f79929979a5
parent755eec745fa324fdd13078f0147638f8731652ba (diff)
parent8023494a94d842963c157e5647b9c1b62b6ea0a8 (diff)
downloadgitea-5f84e8f4fffa103438e3d1af9dfe3ad8f669e4e5.tar.gz
gitea-5f84e8f4fffa103438e3d1af9dfe3ad8f669e4e5.zip
Merge pull request #346 from nuss-justin/vet
Fix invalid struct tags and remove unreachable code.
-rw-r--r--modules/auth/repo_form.go2
-rw-r--r--modules/log/file.go2
-rw-r--r--modules/social/social.go1
3 files changed, 2 insertions, 3 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index a6c71e99ea..1b1a4f7120 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -71,7 +71,7 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs *binding.Errors, l
type NewWebhookForm struct {
Url string `form:"url" binding:"Required;Url"`
ContentType string `form:"content_type" binding:"Required"`
- Secret string `form:"secret""`
+ Secret string `form:"secret"`
PushOnly bool `form:"push_only"`
Active bool `form:"active"`
}
diff --git a/modules/log/file.go b/modules/log/file.go
index cce5352969..52a2f68c73 100644
--- a/modules/log/file.go
+++ b/modules/log/file.go
@@ -34,7 +34,7 @@ type FileLogWriter struct {
// Rotate daily
Daily bool `json:"daily"`
- Maxdays int64 `json:"maxdays`
+ Maxdays int64 `json:"maxdays"`
daily_opendate int
Rotate bool `json:"rotate"`
diff --git a/modules/social/social.go b/modules/social/social.go
index 326a463fac..f4d8598820 100644
--- a/modules/social/social.go
+++ b/modules/social/social.go
@@ -391,5 +391,4 @@ func (s *SocialWeibo) UserInfo(token *oauth.Token, _ *url.URL) (*BasicUserInfo,
Identity: token.Extra["id_token"],
Name: data.Name,
}, nil
- return nil, nil
}