aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2018-05-27 08:53:48 +0800
committerUnknwon <u@gogs.io>2018-05-27 08:53:48 +0800
commitaff42082441715559bb2e62e11550af1a946a8c9 (patch)
treed5349c3d486346210a989659e788b50589198e69 /pkg
parent73dbaefec50c4fc99a63c5be2891a1a34db18767 (diff)
*: rename "gogits" to "gogs"
Diffstat (limited to 'pkg')
-rw-r--r--pkg/auth/auth.go8
-rw-r--r--pkg/context/api.go6
-rw-r--r--pkg/context/api_org.go2
-rw-r--r--pkg/context/auth.go4
-rw-r--r--pkg/context/context.go10
-rw-r--r--pkg/context/org.go6
-rw-r--r--pkg/context/repo.go8
-rw-r--r--pkg/cron/cron.go6
-rw-r--r--pkg/form/repo.go2
-rw-r--r--pkg/mailer/mail.go4
-rw-r--r--pkg/mailer/mailer.go2
-rw-r--r--pkg/markup/markdown.go4
-rw-r--r--pkg/markup/markdown_test.go4
-rw-r--r--pkg/markup/markup.go6
-rw-r--r--pkg/markup/markup_test.go4
-rw-r--r--pkg/markup/sanitizer.go2
-rw-r--r--pkg/markup/sanitizer_test.go2
-rw-r--r--pkg/setting/miniwinsvc.go2
-rw-r--r--pkg/setting/setting.go14
-rw-r--r--pkg/ssh/ssh.go4
-rw-r--r--pkg/template/highlight/highlight.go6
-rw-r--r--pkg/template/template.go8
-rw-r--r--pkg/tool/tool.go4
23 files changed, 59 insertions, 59 deletions
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 2489aff0..8c49da26 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -13,10 +13,10 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/setting"
- "github.com/gogits/gogs/pkg/tool"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/models/errors"
+ "github.com/gogs/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/tool"
)
func IsAPIPath(url string) bool {
diff --git a/pkg/context/api.go b/pkg/context/api.go
index f4b95b4c..0aa025dc 100644
--- a/pkg/context/api.go
+++ b/pkg/context/api.go
@@ -12,7 +12,7 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/setting"
)
type APIContext struct {
@@ -20,8 +20,8 @@ type APIContext struct {
Org *APIOrganization
}
-// FIXME: move to github.com/gogits/go-gogs-client
-const DOC_URL = "https://github.com/gogits/go-gogs-client/wiki"
+// FIXME: move to github.com/gogs/go-gogs-client
+const DOC_URL = "https://github.com/gogs/go-gogs-client/wiki"
// Error responses error message to client with given message.
// If status is 500, also it prints error to log.
diff --git a/pkg/context/api_org.go b/pkg/context/api_org.go
index ecf60a19..bb5afef5 100644
--- a/pkg/context/api_org.go
+++ b/pkg/context/api_org.go
@@ -5,7 +5,7 @@
package context
import (
- "github.com/gogits/gogs/models"
+ "github.com/gogs/gogs/models"
)
type APIOrganization struct {
diff --git a/pkg/context/auth.go b/pkg/context/auth.go
index 3ffc9c8f..60c020a0 100644
--- a/pkg/context/auth.go
+++ b/pkg/context/auth.go
@@ -10,8 +10,8 @@ import (
"github.com/go-macaron/csrf"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/pkg/auth"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/auth"
+ "github.com/gogs/gogs/pkg/setting"
)
type ToggleOptions struct {
diff --git a/pkg/context/context.go b/pkg/context/context.go
index ed97395b..fdd02421 100644
--- a/pkg/context/context.go
+++ b/pkg/context/context.go
@@ -21,11 +21,11 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/auth"
- "github.com/gogits/gogs/pkg/form"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/models/errors"
+ "github.com/gogs/gogs/pkg/auth"
+ "github.com/gogs/gogs/pkg/form"
+ "github.com/gogs/gogs/pkg/setting"
)
// Context represents context of a request.
diff --git a/pkg/context/org.go b/pkg/context/org.go
index 45c23bd6..1ff962ee 100644
--- a/pkg/context/org.go
+++ b/pkg/context/org.go
@@ -9,9 +9,9 @@ import (
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/models/errors"
+ "github.com/gogs/gogs/pkg/setting"
)
type Organization struct {
diff --git a/pkg/context/repo.go b/pkg/context/repo.go
index 761b8af0..d7c9f0ce 100644
--- a/pkg/context/repo.go
+++ b/pkg/context/repo.go
@@ -12,11 +12,11 @@ import (
"gopkg.in/editorconfig/editorconfig-core-go.v1"
"gopkg.in/macaron.v1"
- "github.com/gogits/git-module"
+ "github.com/gogs/git-module"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/models/errors"
+ "github.com/gogs/gogs/pkg/setting"
)
type PullRequest struct {
diff --git a/pkg/cron/cron.go b/pkg/cron/cron.go
index 419be06b..1e4476fe 100644
--- a/pkg/cron/cron.go
+++ b/pkg/cron/cron.go
@@ -9,10 +9,10 @@ import (
log "gopkg.in/clog.v1"
- "github.com/gogits/cron"
+ "github.com/gogs/cron"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/pkg/setting"
)
var c = cron.New()
diff --git a/pkg/form/repo.go b/pkg/form/repo.go
index 0389ca76..5ec2cf7d 100644
--- a/pkg/form/repo.go
+++ b/pkg/form/repo.go
@@ -12,7 +12,7 @@ import (
"github.com/go-macaron/binding"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/models"
+ "github.com/gogs/gogs/models"
)
// _______________________________________ _________.______________________ _______________.___.
diff --git a/pkg/mailer/mail.go b/pkg/mailer/mail.go
index 200e2e11..64f900d3 100644
--- a/pkg/mailer/mail.go
+++ b/pkg/mailer/mail.go
@@ -12,8 +12,8 @@ import (
"gopkg.in/gomail.v2"
"gopkg.in/macaron.v1"
- "github.com/gogits/gogs/pkg/markup"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/markup"
+ "github.com/gogs/gogs/pkg/setting"
)
const (
diff --git a/pkg/mailer/mailer.go b/pkg/mailer/mailer.go
index 3b8f2e0b..b3bc1009 100644
--- a/pkg/mailer/mailer.go
+++ b/pkg/mailer/mailer.go
@@ -18,7 +18,7 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/gomail.v2"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/setting"
)
type Message struct {
diff --git a/pkg/markup/markdown.go b/pkg/markup/markdown.go
index 1f055549..77fb6dbe 100644
--- a/pkg/markup/markdown.go
+++ b/pkg/markup/markdown.go
@@ -14,8 +14,8 @@ import (
"github.com/russross/blackfriday"
- "github.com/gogits/gogs/pkg/setting"
- "github.com/gogits/gogs/pkg/tool"
+ "github.com/gogs/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/tool"
)
// IsMarkdownFile reports whether name looks like a Markdown file based on its extension.
diff --git a/pkg/markup/markdown_test.go b/pkg/markup/markdown_test.go
index 15a66b81..ee743452 100644
--- a/pkg/markup/markdown_test.go
+++ b/pkg/markup/markdown_test.go
@@ -12,8 +12,8 @@ import (
"github.com/russross/blackfriday"
. "github.com/smartystreets/goconvey/convey"
- . "github.com/gogits/gogs/pkg/markup"
- "github.com/gogits/gogs/pkg/setting"
+ . "github.com/gogs/gogs/pkg/markup"
+ "github.com/gogs/gogs/pkg/setting"
)
func Test_IsMarkdownFile(t *testing.T) {
diff --git a/pkg/markup/markup.go b/pkg/markup/markup.go
index b9682731..b8e1519d 100644
--- a/pkg/markup/markup.go
+++ b/pkg/markup/markup.go
@@ -14,8 +14,8 @@ import (
"github.com/Unknwon/com"
"golang.org/x/net/html"
- "github.com/gogits/gogs/pkg/setting"
- "github.com/gogits/gogs/pkg/tool"
+ "github.com/gogs/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/tool"
)
// IsReadmeFile reports whether name looks like a README file based on its extension.
@@ -49,7 +49,7 @@ var (
// IssueAlphanumericPattern matches string that references to an alphanumeric issue, e.g. ABC-1234
IssueAlphanumericPattern = regexp.MustCompile(`( |^|\(|\[)[A-Z]{1,10}-[1-9][0-9]*\b`)
// CrossReferenceIssueNumericPattern matches string that references a numeric issue in a difference repository
- // e.g. gogits/gogs#12345
+ // e.g. gogs/gogs#12345
CrossReferenceIssueNumericPattern = regexp.MustCompile(`( |^)[0-9a-zA-Z-_\.]+/[0-9a-zA-Z-_\.]+#[0-9]+\b`)
// Sha1CurrentPattern matches string that represents a commit SHA, e.g. d8a994ef243349f321568f9e36d5c3f444b99cae
diff --git a/pkg/markup/markup_test.go b/pkg/markup/markup_test.go
index b741cc5d..97250d6c 100644
--- a/pkg/markup/markup_test.go
+++ b/pkg/markup/markup_test.go
@@ -10,8 +10,8 @@ import (
. "github.com/smartystreets/goconvey/convey"
- . "github.com/gogits/gogs/pkg/markup"
- "github.com/gogits/gogs/pkg/setting"
+ . "github.com/gogs/gogs/pkg/markup"
+ "github.com/gogs/gogs/pkg/setting"
)
func Test_IsReadmeFile(t *testing.T) {
diff --git a/pkg/markup/sanitizer.go b/pkg/markup/sanitizer.go
index 39dcff66..371f5b3f 100644
--- a/pkg/markup/sanitizer.go
+++ b/pkg/markup/sanitizer.go
@@ -10,7 +10,7 @@ import (
"github.com/microcosm-cc/bluemonday"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/setting"
)
// Sanitizer is a protection wrapper of *bluemonday.Policy which does not allow
diff --git a/pkg/markup/sanitizer_test.go b/pkg/markup/sanitizer_test.go
index ae341acc..194c27af 100644
--- a/pkg/markup/sanitizer_test.go
+++ b/pkg/markup/sanitizer_test.go
@@ -9,7 +9,7 @@ import (
. "github.com/smartystreets/goconvey/convey"
- . "github.com/gogits/gogs/pkg/markup"
+ . "github.com/gogs/gogs/pkg/markup"
)
func Test_Sanitizer(t *testing.T) {
diff --git a/pkg/setting/miniwinsvc.go b/pkg/setting/miniwinsvc.go
index 730b3ea3..a7c6890d 100644
--- a/pkg/setting/miniwinsvc.go
+++ b/pkg/setting/miniwinsvc.go
@@ -7,7 +7,7 @@
package setting
import (
- _ "github.com/gogits/minwinsvc"
+ _ "github.com/gogs/minwinsvc"
)
func init() {
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index a43f881c..eb0efd11 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -25,11 +25,11 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/ini.v1"
- "github.com/gogits/go-libravatar"
+ "github.com/gogs/go-libravatar"
- "github.com/gogits/gogs/pkg/bindata"
- "github.com/gogits/gogs/pkg/process"
- "github.com/gogits/gogs/pkg/user"
+ "github.com/gogs/gogs/pkg/bindata"
+ "github.com/gogs/gogs/pkg/process"
+ "github.com/gogs/gogs/pkg/user"
)
type Scheme string
@@ -389,7 +389,7 @@ func getOpenSSHVersion() string {
log.Fatal(2, "Fail to get OpenSSH version: %v - %s", err, stderr)
}
- // Trim unused information: https://github.com/gogits/gogs/issues/4507#issuecomment-305150441
+ // Trim unused information: https://github.com/gogs/gogs/issues/4507#issuecomment-305150441
version := strings.TrimRight(strings.Fields(stderr)[0], ",1234567890")
version = strings.TrimSuffix(strings.TrimPrefix(version, "OpenSSH_"), "p")
return version
@@ -511,7 +511,7 @@ func NewContext() {
}
// Check if server is eligible for minimum key size check when user choose to enable.
- // Windows server and OpenSSH version lower than 5.1 (https://github.com/gogits/gogs/issues/4507)
+ // Windows server and OpenSSH version lower than 5.1 (https://github.com/gogs/gogs/issues/4507)
// are forced to be disabled because the "ssh-keygen" in Windows does not print key type.
if SSH.MinimumKeySizeCheck &&
(IsWindows || version.Compare(getOpenSSHVersion(), "5.1", "<")) {
@@ -816,7 +816,7 @@ func newSessionService() {
SessionConfig.Provider = Cfg.Section("session").Key("PROVIDER").In("memory",
[]string{"memory", "file", "redis", "mysql"})
SessionConfig.ProviderConfig = strings.Trim(Cfg.Section("session").Key("PROVIDER_CONFIG").String(), "\" ")
- SessionConfig.CookieName = Cfg.Section("session").Key("COOKIE_NAME").MustString("i_like_gogits")
+ SessionConfig.CookieName = Cfg.Section("session").Key("COOKIE_NAME").MustString("i_like_gogs")
SessionConfig.CookiePath = AppSubURL
SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool()
SessionConfig.Gclifetime = Cfg.Section("session").Key("GC_INTERVAL_TIME").MustInt64(3600)
diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
index d3526021..fd79f680 100644
--- a/pkg/ssh/ssh.go
+++ b/pkg/ssh/ssh.go
@@ -18,8 +18,8 @@ import (
"golang.org/x/crypto/ssh"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/pkg/setting"
)
func cleanCommand(cmd string) string {
diff --git a/pkg/template/highlight/highlight.go b/pkg/template/highlight/highlight.go
index 05029a4a..11b3967f 100644
--- a/pkg/template/highlight/highlight.go
+++ b/pkg/template/highlight/highlight.go
@@ -8,7 +8,7 @@ import (
"path"
"strings"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/setting"
)
var (
@@ -21,8 +21,8 @@ var (
// File names that are representing highlight classes.
highlightFileNames = map[string]bool{
"cmakelists.txt": true,
- "dockerfile": true,
- "makefile": true,
+ "dockerfile": true,
+ "makefile": true,
}
// Extensions that are same as highlight classes.
diff --git a/pkg/template/template.go b/pkg/template/template.go
index dc633885..dd92ba61 100644
--- a/pkg/template/template.go
+++ b/pkg/template/template.go
@@ -21,10 +21,10 @@ import (
log "gopkg.in/clog.v1"
"gopkg.in/editorconfig/editorconfig-core-go.v1"
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/pkg/markup"
- "github.com/gogits/gogs/pkg/setting"
- "github.com/gogits/gogs/pkg/tool"
+ "github.com/gogs/gogs/models"
+ "github.com/gogs/gogs/pkg/markup"
+ "github.com/gogs/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/tool"
)
// TODO: only initialize map once and save to a local variable to reduce copies.
diff --git a/pkg/tool/tool.go b/pkg/tool/tool.go
index 333790fe..44e62d98 100644
--- a/pkg/tool/tool.go
+++ b/pkg/tool/tool.go
@@ -22,9 +22,9 @@ import (
"github.com/Unknwon/i18n"
log "gopkg.in/clog.v1"
- "github.com/gogits/chardet"
+ "github.com/gogs/chardet"
- "github.com/gogits/gogs/pkg/setting"
+ "github.com/gogs/gogs/pkg/setting"
)
// MD5Bytes encodes string to MD5 bytes.