From aff42082441715559bb2e62e11550af1a946a8c9 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 27 May 2018 08:53:48 +0800 Subject: [PATCH] *: rename "gogits" to "gogs" --- cmd/admin.go | 4 ++-- cmd/backup.go | 4 ++-- cmd/hook.go | 16 ++++++++-------- cmd/import.go | 2 +- cmd/restore.go | 4 ++-- cmd/serv.go | 8 ++++---- cmd/web.go | 28 ++++++++++++++-------------- docker/build.sh | 6 +++--- docker/no-pic.patch | 2 +- gogs.go | 4 ++-- models/access.go | 2 +- models/action.go | 10 +++++----- models/admin.go | 4 ++-- models/attachment.go | 2 +- models/comment.go | 6 +++--- models/git_diff.go | 8 ++++---- models/git_diff_test.go | 2 +- models/issue.go | 8 ++++---- models/issue_label.go | 4 ++-- models/issue_mail.go | 6 +++--- models/login_source.go | 8 ++++---- models/migrations/migrations.go | 6 +++--- models/migrations/v15.go | 2 +- models/migrations/v16.go | 4 ++-- models/milestone.go | 4 ++-- models/mirror.go | 10 +++++----- models/models.go | 4 ++-- models/org_team.go | 2 +- models/pull.go | 12 ++++++------ models/release.go | 8 ++++---- models/repo.go | 16 ++++++++-------- models/repo_branch.go | 6 +++--- models/repo_collaboration.go | 2 +- models/repo_editor.go | 8 ++++---- models/repo_test.go | 4 ++-- models/ssh_key.go | 6 +++--- models/ssh_key_test.go | 2 +- models/token.go | 2 +- models/two_factor.go | 6 +++--- models/update.go | 2 +- models/user.go | 12 ++++++------ models/user_mail.go | 2 +- models/webhook.go | 10 +++++----- models/webhook_dingtalk.go | 4 ++-- models/webhook_discord.go | 6 +++--- models/webhook_slack.go | 6 +++--- models/wiki.go | 6 +++--- pkg/auth/auth.go | 8 ++++---- pkg/context/api.go | 6 +++--- pkg/context/api_org.go | 2 +- pkg/context/auth.go | 4 ++-- pkg/context/context.go | 10 +++++----- pkg/context/org.go | 6 +++--- pkg/context/repo.go | 8 ++++---- pkg/cron/cron.go | 6 +++--- pkg/form/repo.go | 2 +- pkg/mailer/mail.go | 4 ++-- pkg/mailer/mailer.go | 2 +- pkg/markup/markdown.go | 4 ++-- pkg/markup/markdown_test.go | 4 ++-- pkg/markup/markup.go | 6 +++--- pkg/markup/markup_test.go | 4 ++-- pkg/markup/sanitizer.go | 2 +- pkg/markup/sanitizer_test.go | 2 +- pkg/setting/miniwinsvc.go | 2 +- pkg/setting/setting.go | 14 +++++++------- pkg/ssh/ssh.go | 4 ++-- pkg/template/highlight/highlight.go | 6 +++--- pkg/template/template.go | 8 ++++---- pkg/tool/tool.go | 4 ++-- routes/admin/admin.go | 14 +++++++------- routes/admin/auths.go | 10 +++++----- routes/admin/notice.go | 6 +++--- routes/admin/orgs.go | 8 ++++---- routes/admin/repos.go | 6 +++--- routes/admin/users.go | 12 ++++++------ routes/api/v1/admin/org.go | 10 +++++----- routes/api/v1/admin/org_repo.go | 6 +++--- routes/api/v1/admin/org_team.go | 10 +++++----- routes/api/v1/admin/repo.go | 10 +++++----- routes/api/v1/admin/user.go | 22 +++++++++++----------- routes/api/v1/api.go | 20 ++++++++++---------- routes/api/v1/convert/convert.go | 6 +++--- routes/api/v1/convert/utils.go | 2 +- routes/api/v1/misc/markdown.go | 10 +++++----- routes/api/v1/org/org.go | 20 ++++++++++---------- routes/api/v1/org/team.go | 6 +++--- routes/api/v1/repo/branch.go | 12 ++++++------ routes/api/v1/repo/collaborators.go | 8 ++++---- routes/api/v1/repo/file.go | 12 ++++++------ routes/api/v1/repo/hook.go | 16 ++++++++-------- routes/api/v1/repo/issue.go | 10 +++++----- routes/api/v1/repo/issue_comment.go | 6 +++--- routes/api/v1/repo/issue_label.go | 8 ++++---- routes/api/v1/repo/key.go | 18 +++++++++--------- routes/api/v1/repo/label.go | 6 +++--- routes/api/v1/repo/milestone.go | 6 +++--- routes/api/v1/repo/repo.go | 24 ++++++++++++------------ routes/api/v1/user/app.go | 10 +++++----- routes/api/v1/user/email.go | 16 ++++++++-------- routes/api/v1/user/follower.go | 18 +++++++++--------- routes/api/v1/user/key.go | 24 ++++++++++++------------ routes/api/v1/user/user.go | 10 +++++----- routes/dev/template.go | 6 +++--- routes/home.go | 8 ++++---- routes/install.go | 24 ++++++++++++------------ routes/org/members.go | 8 ++++---- routes/org/org.go | 8 ++++---- routes/org/setting.go | 12 ++++++------ routes/org/teams.go | 8 ++++---- routes/repo/branch.go | 6 +++--- routes/repo/commit.go | 10 +++++----- routes/repo/download.go | 8 ++++---- routes/repo/editor.go | 14 +++++++------- routes/repo/http.go | 10 +++++----- routes/repo/issue.go | 16 ++++++++-------- routes/repo/pull.go | 14 +++++++------- routes/repo/release.go | 10 +++++----- routes/repo/repo.go | 14 +++++++------- routes/repo/setting.go | 14 +++++++------- routes/repo/view.go | 16 ++++++++-------- routes/repo/webhook.go | 16 ++++++++-------- routes/repo/wiki.go | 10 +++++----- routes/user/auth.go | 12 ++++++------ routes/user/home.go | 8 ++++---- routes/user/profile.go | 10 +++++----- routes/user/setting.go | 14 +++++++------- 127 files changed, 533 insertions(+), 533 deletions(-) diff --git a/cmd/admin.go b/cmd/admin.go index 52c4496df..d249fd07d 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -11,8 +11,8 @@ import ( "github.com/urfave/cli" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/setting" ) var ( diff --git a/cmd/backup.go b/cmd/backup.go index ffc9afbcb..4ff62887d 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -17,8 +17,8 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/ini.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/setting" ) var Backup = cli.Command{ diff --git a/cmd/hook.go b/cmd/hook.go index 16ea6b646..ec60ac05c 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -19,15 +19,15 @@ import ( "github.com/urfave/cli" log "gopkg.in/clog.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/httplib" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template" - http "github.com/gogits/gogs/routes/repo" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/httplib" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" + http "github.com/gogs/gogs/routes/repo" ) var ( diff --git a/cmd/import.go b/cmd/import.go index 726359eea..98aa76905 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -15,7 +15,7 @@ import ( "github.com/Unknwon/com" "github.com/urfave/cli" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) var ( diff --git a/cmd/restore.go b/cmd/restore.go index 19c264641..db81b8b08 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -15,8 +15,8 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/ini.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/setting" ) var Restore = cli.Command{ diff --git a/cmd/serv.go b/cmd/serv.go index dd4c1217d..e34e8b107 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -16,10 +16,10 @@ import ( "github.com/urfave/cli" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/setting" - http "github.com/gogits/gogs/routes/repo" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/setting" + http "github.com/gogs/gogs/routes/repo" ) const ( diff --git a/cmd/web.go b/cmd/web.go index 9a709e1cd..dc8937f9a 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -29,20 +29,20 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/macaron.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/bindata" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template" - "github.com/gogits/gogs/routes" - "github.com/gogits/gogs/routes/admin" - apiv1 "github.com/gogits/gogs/routes/api/v1" - "github.com/gogits/gogs/routes/dev" - "github.com/gogits/gogs/routes/org" - "github.com/gogits/gogs/routes/repo" - "github.com/gogits/gogs/routes/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/bindata" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" + "github.com/gogs/gogs/routes" + "github.com/gogs/gogs/routes/admin" + apiv1 "github.com/gogs/gogs/routes/api/v1" + "github.com/gogs/gogs/routes/dev" + "github.com/gogs/gogs/routes/org" + "github.com/gogs/gogs/routes/repo" + "github.com/gogs/gogs/routes/user" ) var Web = cli.Command{ diff --git a/docker/build.sh b/docker/build.sh index 80d620ff7..46da4fddb 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -10,9 +10,9 @@ export PATH=/usr/local/go/bin:${PATH}:${GOPATH}/bin apk --no-cache --no-progress add --virtual build-deps build-base linux-pam-dev # Build Gogs -mkdir -p ${GOPATH}/src/github.com/gogits/ -ln -s /app/gogs/build ${GOPATH}/src/github.com/gogits/gogs -cd ${GOPATH}/src/github.com/gogits/gogs +mkdir -p ${GOPATH}/src/github.com/gogs/ +ln -s /app/gogs/build ${GOPATH}/src/github.com/gogs/gogs +cd ${GOPATH}/src/github.com/gogs/gogs # Needed since git 2.9.3 or 2.9.4 git config --global http.https://gopkg.in.followRedirects true make build TAGS="sqlite cert pam" diff --git a/docker/no-pic.patch b/docker/no-pic.patch index 74d30270c..9da799211 100644 --- a/docker/no-pic.patch +++ b/docker/no-pic.patch @@ -13,4 +13,4 @@ index 14f4fa9..5599307 100644 + if l.Debugvlog != 0 { l.Logf("%5.2f host link:", obj.Cputime()) - for _, v := range argv { \ No newline at end of file + for _, v := range argv { diff --git a/gogs.go b/gogs.go index d7cb3f0ef..818644aac 100644 --- a/gogs.go +++ b/gogs.go @@ -12,8 +12,8 @@ import ( "github.com/urfave/cli" - "github.com/gogits/gogs/cmd" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/cmd" + "github.com/gogs/gogs/pkg/setting" ) const APP_VER = "0.11.49.0521" diff --git a/models/access.go b/models/access.go index df3cd7665..c10c97509 100644 --- a/models/access.go +++ b/models/access.go @@ -9,7 +9,7 @@ import ( log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models/errors" + "github.com/gogs/gogs/models/errors" ) type AccessMode int diff --git a/models/action.go b/models/action.go index 288a1812e..62c0e9b26 100644 --- a/models/action.go +++ b/models/action.go @@ -17,12 +17,12 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) type ActionType int diff --git a/models/admin.go b/models/admin.go index 10dd61dae..51cf25d9d 100644 --- a/models/admin.go +++ b/models/admin.go @@ -15,8 +15,8 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) type NoticeType int diff --git a/models/attachment.go b/models/attachment.go index fb4ec88db..4072e11e4 100644 --- a/models/attachment.go +++ b/models/attachment.go @@ -15,7 +15,7 @@ import ( "github.com/go-xorm/xorm" gouuid "github.com/satori/go.uuid" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/comment.go b/models/comment.go index bcea22683..417e4037b 100644 --- a/models/comment.go +++ b/models/comment.go @@ -13,10 +13,10 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/markup" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/markup" ) // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference. diff --git a/models/git_diff.go b/models/git_diff.go index 3a47533fc..cfaf5286f 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -15,11 +15,11 @@ import ( "golang.org/x/net/html/charset" "golang.org/x/text/transform" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/pkg/tool" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template/highlight" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template/highlight" + "github.com/gogs/gogs/pkg/tool" ) type DiffSection struct { diff --git a/models/git_diff_test.go b/models/git_diff_test.go index 740323717..285e5646b 100644 --- a/models/git_diff_test.go +++ b/models/git_diff_test.go @@ -8,7 +8,7 @@ import ( "html/template" "testing" - "github.com/gogits/git-module" + "github.com/gogs/git-module" dmp "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/models/issue.go b/models/issue.go index c2c3d2531..5888bb168 100644 --- a/models/issue.go +++ b/models/issue.go @@ -13,11 +13,11 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) var ( diff --git a/models/issue_label.go b/models/issue_label.go index 7a463a7ab..5e4d1b055 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -13,9 +13,9 @@ import ( "github.com/go-xorm/xorm" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/tool" ) var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})") diff --git a/models/issue_mail.go b/models/issue_mail.go index 7ee38e632..b543c750e 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -10,9 +10,9 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/setting" ) func (issue *Issue) MailSubject() string { diff --git a/models/login_source.go b/models/login_source.go index 3a1162ec2..436a0ffd6 100644 --- a/models/login_source.go +++ b/models/login_source.go @@ -23,10 +23,10 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/ini.v1" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/auth/ldap" - "github.com/gogits/gogs/pkg/auth/pam" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/auth/ldap" + "github.com/gogs/gogs/pkg/auth/pam" + "github.com/gogs/gogs/pkg/setting" ) type LoginType int diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 06747d381..432717c75 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -13,7 +13,7 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/tool" ) const _MIN_DB_VER = 10 @@ -98,9 +98,9 @@ You can migrate your older database using a previous release, then you can upgra Please save following instructions to somewhere and start working: - If you were using below 0.6.0 (e.g. 0.5.x), download last supported archive from following link: - https://github.com/gogits/gogs/releases/tag/v0.7.33 + https://github.com/gogs/gogs/releases/tag/v0.7.33 - If you were using below 0.7.0 (e.g. 0.6.x), download last supported archive from following link: - https://github.com/gogits/gogs/releases/tag/v0.9.141 + https://github.com/gogs/gogs/releases/tag/v0.9.141 Once finished downloading, diff --git a/models/migrations/v15.go b/models/migrations/v15.go index ebee4964d..d6cccb1d1 100644 --- a/models/migrations/v15.go +++ b/models/migrations/v15.go @@ -15,7 +15,7 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) func generateAndMigrateGitHooks(x *xorm.Engine) (err error) { diff --git a/models/migrations/v16.go b/models/migrations/v16.go index c5facc81f..e95fe10ad 100644 --- a/models/migrations/v16.go +++ b/models/migrations/v16.go @@ -12,9 +12,9 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) func updateRepositorySizes(x *xorm.Engine) (err error) { diff --git a/models/milestone.go b/models/milestone.go index 72fe5f636..1c14433ec 100644 --- a/models/milestone.go +++ b/models/milestone.go @@ -11,9 +11,9 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) // Milestone represents a milestone of repository. diff --git a/models/mirror.go b/models/mirror.go index f48e8efa4..76427fae1 100644 --- a/models/mirror.go +++ b/models/mirror.go @@ -15,12 +15,12 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/ini.v1" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength) diff --git a/models/models.go b/models/models.go index 6fcd26194..f33c32d0b 100644 --- a/models/models.go +++ b/models/models.go @@ -23,8 +23,8 @@ import ( _ "github.com/lib/pq" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models/migrations" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models/migrations" + "github.com/gogs/gogs/pkg/setting" ) // Engine represents a XORM engine or session. diff --git a/models/org_team.go b/models/org_team.go index 3e8016e8e..6dd3876fb 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -31,7 +31,7 @@ type Team struct { func (t *Team) AfterSet(colName string, _ xorm.Cell) { switch colName { case "num_repos": - // LEGACY [1.0]: this is backward compatibility bug fix for https://github.com/gogits/gogs/issues/3671 + // LEGACY [1.0]: this is backward compatibility bug fix for https://github.com/gogs/gogs/issues/3671 if t.NumRepos < 0 { t.NumRepos = 0 } diff --git a/models/pull.go b/models/pull.go index de188c098..b4524f163 100644 --- a/models/pull.go +++ b/models/pull.go @@ -15,13 +15,13 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) diff --git a/models/release.go b/models/release.go index d83345549..2c350664a 100644 --- a/models/release.go +++ b/models/release.go @@ -13,11 +13,11 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/process" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/process" ) // Release represents a release of repository. diff --git a/models/repo.go b/models/repo.go index 827c9aaf0..1cba9d4b0 100644 --- a/models/repo.go +++ b/models/repo.go @@ -23,15 +23,15 @@ import ( log "gopkg.in/clog.v1" "gopkg.in/ini.v1" - git "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + git "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/bindata" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/bindata" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var repoWorkingPool = sync.NewExclusivePool() diff --git a/models/repo_branch.go b/models/repo_branch.go index 6439faf04..1d98fd12a 100644 --- a/models/repo_branch.go +++ b/models/repo_branch.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/tool" ) type Branch struct { diff --git a/models/repo_collaboration.go b/models/repo_collaboration.go index f3babd425..107e1c5aa 100644 --- a/models/repo_collaboration.go +++ b/models/repo_collaboration.go @@ -9,7 +9,7 @@ import ( log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" ) // Collaboration represent the relation between an individual and a repository. diff --git a/models/repo_editor.go b/models/repo_editor.go index ebf25ecd3..27683adee 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -19,11 +19,11 @@ import ( gouuid "github.com/satori/go.uuid" log "gopkg.in/clog.v1" - git "github.com/gogits/git-module" + git "github.com/gogs/git-module" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" ) // ___________ .___.__ __ ___________.__.__ diff --git a/models/repo_test.go b/models/repo_test.go index 76025a4ce..2d7f9c382 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -5,8 +5,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - . "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/markup" + . "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/markup" ) func TestRepo(t *testing.T) { diff --git a/models/ssh_key.go b/models/ssh_key.go index 350c5f75f..7caf033e1 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -23,9 +23,9 @@ import ( "golang.org/x/crypto/ssh" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go index 537f16b03..02086ac4d 100644 --- a/models/ssh_key_test.go +++ b/models/ssh_key_test.go @@ -11,7 +11,7 @@ import ( . "github.com/smartystreets/goconvey/convey" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) func init() { diff --git a/models/token.go b/models/token.go index 940d76f41..7cac1a3fd 100644 --- a/models/token.go +++ b/models/token.go @@ -10,7 +10,7 @@ import ( "github.com/go-xorm/xorm" gouuid "github.com/satori/go.uuid" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/tool" ) // AccessToken represents a personal access token. diff --git a/models/two_factor.go b/models/two_factor.go index 60d261479..2de312eb2 100644 --- a/models/two_factor.go +++ b/models/two_factor.go @@ -15,9 +15,9 @@ import ( "github.com/pquerna/otp/totp" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) // TwoFactor represents a two-factor authentication token. diff --git a/models/update.go b/models/update.go index 95122fccc..db01392c0 100644 --- a/models/update.go +++ b/models/update.go @@ -10,7 +10,7 @@ import ( "os/exec" "strings" - git "github.com/gogits/git-module" + git "github.com/gogs/git-module" ) // CommitToPushCommit transforms a git.Commit to PushCommit type. diff --git a/models/user.go b/models/user.go index f53b48e70..562437cd7 100644 --- a/models/user.go +++ b/models/user.go @@ -26,13 +26,13 @@ import ( "golang.org/x/crypto/pbkdf2" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/avatar" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/avatar" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) type UserType int diff --git a/models/user_mail.go b/models/user_mail.go index a5911aa7f..ff99b2a79 100644 --- a/models/user_mail.go +++ b/models/user_mail.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/gogits/gogs/models/errors" + "github.com/gogs/gogs/models/errors" ) // EmailAdresses is the list of all email addresses of a user. Can contain the diff --git a/models/webhook.go b/models/webhook.go index c37a1a478..4008d6b91 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -19,12 +19,12 @@ import ( gouuid "github.com/satori/go.uuid" log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/httplib" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/httplib" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength) diff --git a/models/webhook_dingtalk.go b/models/webhook_dingtalk.go index 735cddde4..e910ede7a 100644 --- a/models/webhook_dingtalk.go +++ b/models/webhook_dingtalk.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" ) const ( diff --git a/models/webhook_discord.go b/models/webhook_discord.go index 9cacc8372..952d093ab 100644 --- a/models/webhook_discord.go +++ b/models/webhook_discord.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) type DiscordEmbedFooterObject struct { diff --git a/models/webhook_slack.go b/models/webhook_slack.go index 76954795f..be75303ef 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) type SlackMeta struct { diff --git a/models/wiki.go b/models/wiki.go index 7e085d0a9..882ccdf04 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -15,10 +15,10 @@ import ( "github.com/Unknwon/com" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var wikiWorkingPool = sync.NewExclusivePool() diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 2489aff07..8c49da266 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 f4b95b4c7..0aa025dcd 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 ecf60a190..bb5afef5d 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 3ffc9c8f2..60c020a0d 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 ed97395bf..fdd024215 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 45c23bd6e..1ff962ee4 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 761b8af01..d7c9f0ced 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 419be06b9..1e4476feb 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 0389ca767..5ec2cf7d0 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 200e2e113..64f900d35 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 3b8f2e0bf..b3bc10098 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 1f055549a..77fb6dbec 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 15a66b816..ee743452d 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 b9682731c..b8e1519da 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 b741cc5d0..97250d6c0 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 39dcff66a..371f5b3f6 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 ae341accd..194c27af6 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 730b3ea34..a7c6890d1 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 a43f881cf..eb0efd116 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 d35260211..fd79f680c 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 05029a4a1..11b3967fe 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 dc6338850..dd92ba61e 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 333790fee..44e62d980 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. diff --git a/routes/admin/admin.go b/routes/admin/admin.go index e3ac5bdf0..8ae9e54b5 100644 --- a/routes/admin/admin.go +++ b/routes/admin/admin.go @@ -14,13 +14,13 @@ import ( "github.com/Unknwon/com" "gopkg.in/macaron.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/cron" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/cron" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/admin/auths.go b/routes/admin/auths.go index 6356d1129..49f014333 100644 --- a/routes/admin/auths.go +++ b/routes/admin/auths.go @@ -11,11 +11,11 @@ import ( "github.com/go-xorm/core" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/auth/ldap" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/auth/ldap" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/admin/notice.go b/routes/admin/notice.go index c743a1da5..2670d526b 100644 --- a/routes/admin/notice.go +++ b/routes/admin/notice.go @@ -9,9 +9,9 @@ import ( "github.com/Unknwon/paginater" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/admin/orgs.go b/routes/admin/orgs.go index f42e1fdf8..ecbd2fa98 100644 --- a/routes/admin/orgs.go +++ b/routes/admin/orgs.go @@ -5,10 +5,10 @@ package admin import ( - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes" ) const ( diff --git a/routes/admin/repos.go b/routes/admin/repos.go index b4fa22664..b81794876 100644 --- a/routes/admin/repos.go +++ b/routes/admin/repos.go @@ -8,9 +8,9 @@ import ( "github.com/Unknwon/paginater" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/admin/users.go b/routes/admin/users.go index cfeb73de0..f8237e3a6 100644 --- a/routes/admin/users.go +++ b/routes/admin/users.go @@ -10,12 +10,12 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes" ) const ( diff --git a/routes/api/v1/admin/org.go b/routes/api/v1/admin/org.go index 89251d2ec..884684264 100644 --- a/routes/api/v1/admin/org.go +++ b/routes/api/v1/admin/org.go @@ -5,14 +5,14 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/user" - "github.com/gogits/gogs/routes/api/v1/org" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/org" + "github.com/gogs/gogs/routes/api/v1/user" ) -// https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization +// https://github.com/gogs/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization func CreateOrg(c *context.APIContext, form api.CreateOrgOption) { org.CreateOrgForUser(c, form, user.GetUserByParams(c)) } diff --git a/routes/api/v1/admin/org_repo.go b/routes/api/v1/admin/org_repo.go index 7abad1a8c..a2064921b 100644 --- a/routes/api/v1/admin/org_repo.go +++ b/routes/api/v1/admin/org_repo.go @@ -5,9 +5,9 @@ package admin import ( - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" ) func GetRepositoryByParams(c *context.APIContext) *models.Repository { diff --git a/routes/api/v1/admin/org_team.go b/routes/api/v1/admin/org_team.go index ae7485045..5ddf6ae1b 100644 --- a/routes/api/v1/admin/org_team.go +++ b/routes/api/v1/admin/org_team.go @@ -5,12 +5,12 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/convert" - "github.com/gogits/gogs/routes/api/v1/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/routes/api/v1/user" ) func CreateTeam(c *context.APIContext, form api.CreateTeamOption) { diff --git a/routes/api/v1/admin/repo.go b/routes/api/v1/admin/repo.go index 920bac8d6..cec04b494 100644 --- a/routes/api/v1/admin/repo.go +++ b/routes/api/v1/admin/repo.go @@ -5,14 +5,14 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/repo" - "github.com/gogits/gogs/routes/api/v1/user" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/repo" + "github.com/gogs/gogs/routes/api/v1/user" ) -// https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository +// https://github.com/gogs/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository func CreateRepo(c *context.APIContext, form api.CreateRepoOption) { owner := user.GetUserByParams(c) if c.Written() { diff --git a/routes/api/v1/admin/user.go b/routes/api/v1/admin/user.go index d48ecc2f2..b35e30962 100644 --- a/routes/api/v1/admin/user.go +++ b/routes/api/v1/admin/user.go @@ -7,14 +7,14 @@ package admin import ( log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/api/v1/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/api/v1/user" ) func parseLoginSource(c *context.APIContext, u *models.User, sourceID int64, loginName string) { @@ -37,7 +37,7 @@ func parseLoginSource(c *context.APIContext, u *models.User, sourceID int64, log u.LoginName = loginName } -// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-new-user +// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#create-a-new-user func CreateUser(c *context.APIContext, form api.CreateUserOption) { u := &models.User{ Name: form.Username, @@ -74,7 +74,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { c.JSON(201, u.APIFormat()) } -// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#edit-an-existing-user +// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#edit-an-existing-user func EditUser(c *context.APIContext, form api.EditUserOption) { u := user.GetUserByParams(c) if c.Written() { @@ -130,7 +130,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { c.JSON(200, u.APIFormat()) } -// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#delete-a-user +// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#delete-a-user func DeleteUser(c *context.APIContext) { u := user.GetUserByParams(c) if c.Written() { @@ -151,7 +151,7 @@ func DeleteUser(c *context.APIContext) { c.Status(204) } -// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-public-key-for-user +// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#create-a-public-key-for-user func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) { u := user.GetUserByParams(c) if c.Written() { diff --git a/routes/api/v1/api.go b/routes/api/v1/api.go index da811c252..ca29ee863 100644 --- a/routes/api/v1/api.go +++ b/routes/api/v1/api.go @@ -10,17 +10,17 @@ import ( "github.com/go-macaron/binding" "gopkg.in/macaron.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/routes/api/v1/admin" - "github.com/gogits/gogs/routes/api/v1/misc" - "github.com/gogits/gogs/routes/api/v1/org" - "github.com/gogits/gogs/routes/api/v1/repo" - "github.com/gogits/gogs/routes/api/v1/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/routes/api/v1/admin" + "github.com/gogs/gogs/routes/api/v1/misc" + "github.com/gogs/gogs/routes/api/v1/org" + "github.com/gogs/gogs/routes/api/v1/repo" + "github.com/gogs/gogs/routes/api/v1/user" ) func repoAssignment() macaron.Handler { diff --git a/routes/api/v1/convert/convert.go b/routes/api/v1/convert/convert.go index fcadb51fd..a6ced6fc8 100644 --- a/routes/api/v1/convert/convert.go +++ b/routes/api/v1/convert/convert.go @@ -9,10 +9,10 @@ import ( "github.com/Unknwon/com" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" + "github.com/gogs/gogs/models" ) func ToEmail(email *models.EmailAddress) *api.Email { diff --git a/routes/api/v1/convert/utils.go b/routes/api/v1/convert/utils.go index d0beab3d7..e9326eedf 100644 --- a/routes/api/v1/convert/utils.go +++ b/routes/api/v1/convert/utils.go @@ -5,7 +5,7 @@ package convert import ( - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/setting" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/routes/api/v1/misc/markdown.go b/routes/api/v1/misc/markdown.go index 98bfd7d05..6c2102947 100644 --- a/routes/api/v1/misc/markdown.go +++ b/routes/api/v1/misc/markdown.go @@ -5,13 +5,13 @@ package misc import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/markup" ) -// https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document +// https://github.com/gogs/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document func Markdown(c *context.APIContext, form api.MarkdownOption) { if c.HasApiError() { c.Error(422, "", c.GetErrMsg()) @@ -31,7 +31,7 @@ func Markdown(c *context.APIContext, form api.MarkdownOption) { } } -// https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-a-markdown-document-in-raw-mode +// https://github.com/gogs/go-gogs-client/wiki/Miscellaneous#render-a-markdown-document-in-raw-mode func MarkdownRaw(c *context.APIContext) { body, err := c.Req.Body().Bytes() if err != nil { diff --git a/routes/api/v1/org/org.go b/routes/api/v1/org/org.go index 25a0e5b67..3d32eb51f 100644 --- a/routes/api/v1/org/org.go +++ b/routes/api/v1/org/org.go @@ -5,12 +5,12 @@ package org import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/convert" - "github.com/gogits/gogs/routes/api/v1/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/routes/api/v1/user" ) func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user *models.User) { @@ -54,17 +54,17 @@ func listUserOrgs(c *context.APIContext, u *models.User, all bool) { c.JSON(200, &apiOrgs) } -// https://github.com/gogits/go-gogs-client/wiki/Organizations#list-your-organizations +// https://github.com/gogs/go-gogs-client/wiki/Organizations#list-your-organizations func ListMyOrgs(c *context.APIContext) { listUserOrgs(c, c.User, true) } -// https://github.com/gogits/go-gogs-client/wiki/Organizations#create-your-organization +// https://github.com/gogs/go-gogs-client/wiki/Organizations#create-your-organization func CreateMyOrg(c *context.APIContext, apiForm api.CreateOrgOption) { CreateOrgForUser(c, apiForm, c.User) } -// https://github.com/gogits/go-gogs-client/wiki/Organizations#list-user-organizations +// https://github.com/gogs/go-gogs-client/wiki/Organizations#list-user-organizations func ListUserOrgs(c *context.APIContext) { u := user.GetUserByParams(c) if c.Written() { @@ -73,12 +73,12 @@ func ListUserOrgs(c *context.APIContext) { listUserOrgs(c, u, false) } -// https://github.com/gogits/go-gogs-client/wiki/Organizations#get-an-organization +// https://github.com/gogs/go-gogs-client/wiki/Organizations#get-an-organization func Get(c *context.APIContext) { c.JSON(200, convert.ToOrganization(c.Org.Organization)) } -// https://github.com/gogits/go-gogs-client/wiki/Organizations#edit-an-organization +// https://github.com/gogs/go-gogs-client/wiki/Organizations#edit-an-organization func Edit(c *context.APIContext, form api.EditOrgOption) { org := c.Org.Organization if !org.IsOwnedBy(c.User.ID) { diff --git a/routes/api/v1/org/team.go b/routes/api/v1/org/team.go index fd92e7283..ff2d4a2b5 100644 --- a/routes/api/v1/org/team.go +++ b/routes/api/v1/org/team.go @@ -5,10 +5,10 @@ package org import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/convert" ) func ListTeams(c *context.APIContext) { diff --git a/routes/api/v1/repo/branch.go b/routes/api/v1/repo/branch.go index 3e0014785..3323ccd6b 100644 --- a/routes/api/v1/repo/branch.go +++ b/routes/api/v1/repo/branch.go @@ -5,14 +5,14 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/convert" ) -// https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch +// https://github.com/gogs/go-gogs-client/wiki/Repositories#get-branch func GetBranch(c *context.APIContext) { branch, err := c.Repo.Repository.GetBranch(c.Params("*")) if err != nil { @@ -33,7 +33,7 @@ func GetBranch(c *context.APIContext) { c.JSON(200, convert.ToBranch(branch, commit)) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-branches +// https://github.com/gogs/go-gogs-client/wiki/Repositories#list-branches func ListBranches(c *context.APIContext) { branches, err := c.Repo.Repository.GetBranches() if err != nil { diff --git a/routes/api/v1/repo/collaborators.go b/routes/api/v1/repo/collaborators.go index d295ac0fb..4ccfd5471 100644 --- a/routes/api/v1/repo/collaborators.go +++ b/routes/api/v1/repo/collaborators.go @@ -5,11 +5,11 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" ) func ListCollaborators(c *context.APIContext) { diff --git a/routes/api/v1/repo/file.go b/routes/api/v1/repo/file.go index c783e81f0..5afb1113d 100644 --- a/routes/api/v1/repo/file.go +++ b/routes/api/v1/repo/file.go @@ -5,14 +5,14 @@ package repo import ( - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/repo" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/repo" ) -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Contents#download-raw-content func GetRawFile(c *context.APIContext) { if !c.Repo.HasAccess() { c.Status(404) @@ -38,7 +38,7 @@ func GetRawFile(c *context.APIContext) { } } -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-archive +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Contents#download-archive func GetArchive(c *context.APIContext) { repoPath := models.RepoPath(c.Params(":username"), c.Params(":reponame")) gitRepo, err := git.OpenRepository(repoPath) diff --git a/routes/api/v1/repo/hook.go b/routes/api/v1/repo/hook.go index 66125c50c..fb67bf452 100644 --- a/routes/api/v1/repo/hook.go +++ b/routes/api/v1/repo/hook.go @@ -9,15 +9,15 @@ import ( "github.com/Unknwon/com" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/routes/api/v1/convert" ) -// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks +// https://github.com/gogs/go-gogs-client/wiki/Repositories#list-hooks func ListHooks(c *context.APIContext) { hooks, err := models.GetWebhooksByRepoID(c.Repo.Repository.ID) if err != nil { @@ -32,7 +32,7 @@ func ListHooks(c *context.APIContext) { c.JSON(200, &apiHooks) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#create-a-hook +// https://github.com/gogs/go-gogs-client/wiki/Repositories#create-a-hook func CreateHook(c *context.APIContext, form api.CreateHookOption) { if !models.IsValidHookTaskType(form.Type) { c.Error(422, "", "Invalid hook type") @@ -103,7 +103,7 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) { c.JSON(201, convert.ToHook(c.Repo.RepoLink, w)) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#edit-a-hook +// https://github.com/gogs/go-gogs-client/wiki/Repositories#edit-a-hook func EditHook(c *context.APIContext, form api.EditHookOption) { w, err := models.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { diff --git a/routes/api/v1/repo/issue.go b/routes/api/v1/repo/issue.go index d6ae7b4d8..472681759 100644 --- a/routes/api/v1/repo/issue.go +++ b/routes/api/v1/repo/issue.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) func listIssues(c *context.APIContext, opts *models.IssuesOptions) { diff --git a/routes/api/v1/repo/issue_comment.go b/routes/api/v1/repo/issue_comment.go index 161ddf05d..6b2612ae6 100644 --- a/routes/api/v1/repo/issue_comment.go +++ b/routes/api/v1/repo/issue_comment.go @@ -6,10 +6,10 @@ package repo import ( "time" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) func ListIssueComments(c *context.APIContext) { diff --git a/routes/api/v1/repo/issue_label.go b/routes/api/v1/repo/issue_label.go index f3f2d7300..c210825be 100644 --- a/routes/api/v1/repo/issue_label.go +++ b/routes/api/v1/repo/issue_label.go @@ -5,11 +5,11 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" ) func ListIssueLabels(c *context.APIContext) { diff --git a/routes/api/v1/repo/key.go b/routes/api/v1/repo/key.go index 405440d22..db93b9277 100644 --- a/routes/api/v1/repo/key.go +++ b/routes/api/v1/repo/key.go @@ -7,19 +7,19 @@ package repo import ( "fmt" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/api/v1/convert" ) func composeDeployKeysAPILink(repoPath string) string { return setting.AppURL + "api/v1/repos/" + repoPath + "/keys/" } -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys func ListDeployKeys(c *context.APIContext) { keys, err := models.ListDeployKeys(c.Repo.Repository.ID) if err != nil { @@ -40,7 +40,7 @@ func ListDeployKeys(c *context.APIContext) { c.JSON(200, &apiKeys) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#get-a-deploy-key +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#get-a-deploy-key func GetDeployKey(c *context.APIContext) { key, err := models.GetDeployKeyByID(c.ParamsInt64(":id")) if err != nil { @@ -80,7 +80,7 @@ func HandleAddKeyError(c *context.APIContext, err error) { } } -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#add-a-new-deploy-key +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#add-a-new-deploy-key func CreateDeployKey(c *context.APIContext, form api.CreateKeyOption) { content, err := models.CheckPublicKeyString(form.Key) if err != nil { @@ -99,7 +99,7 @@ func CreateDeployKey(c *context.APIContext, form api.CreateKeyOption) { c.JSON(201, convert.ToDeployKey(apiLink, key)) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#remove-a-deploy-key +// https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#remove-a-deploy-key func DeleteDeploykey(c *context.APIContext) { if err := models.DeleteDeployKey(c.User, c.ParamsInt64(":id")); err != nil { if models.IsErrKeyAccessDenied(err) { diff --git a/routes/api/v1/repo/label.go b/routes/api/v1/repo/label.go index 1161d6335..cd661aa28 100644 --- a/routes/api/v1/repo/label.go +++ b/routes/api/v1/repo/label.go @@ -7,10 +7,10 @@ package repo import ( "github.com/Unknwon/com" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) func ListLabels(c *context.APIContext) { diff --git a/routes/api/v1/repo/milestone.go b/routes/api/v1/repo/milestone.go index baf8eb2f5..4c73d8a3c 100644 --- a/routes/api/v1/repo/milestone.go +++ b/routes/api/v1/repo/milestone.go @@ -7,10 +7,10 @@ package repo import ( "time" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) func ListMilestones(c *context.APIContext) { diff --git a/routes/api/v1/repo/repo.go b/routes/api/v1/repo/repo.go index c3fcb0931..db3b72516 100644 --- a/routes/api/v1/repo/repo.go +++ b/routes/api/v1/repo/repo.go @@ -9,17 +9,17 @@ import ( log "gopkg.in/clog.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/api/v1/convert" ) -// https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories +// https://github.com/gogs/go-gogs-client/wiki/Repositories#search-repositories func Search(c *context.APIContext) { opts := &models.SearchRepoOptions{ Keyword: path.Base(c.Query("q")), @@ -182,7 +182,7 @@ func CreateUserRepo(c *context.APIContext, owner *models.User, opt api.CreateRep c.JSON(201, repo.APIFormat(&api.Permission{true, true, true})) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#create +// https://github.com/gogs/go-gogs-client/wiki/Repositories#create func Create(c *context.APIContext, opt api.CreateRepoOption) { // Shouldn't reach this condition, but just in case. if c.User.IsOrganization() { @@ -210,7 +210,7 @@ func CreateOrgRepo(c *context.APIContext, opt api.CreateRepoOption) { CreateUserRepo(c, org, opt) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#migrate +// https://github.com/gogs/go-gogs-client/wiki/Repositories#migrate func Migrate(c *context.APIContext, f form.MigrateRepo) { ctxUser := c.User // Not equal means context user is an organization, @@ -314,7 +314,7 @@ func parseOwnerAndRepo(c *context.APIContext) (*models.User, *models.Repository) return owner, repo } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#get +// https://github.com/gogs/go-gogs-client/wiki/Repositories#get func Get(c *context.APIContext) { _, repo := parseOwnerAndRepo(c) if c.Written() { @@ -328,7 +328,7 @@ func Get(c *context.APIContext) { })) } -// https://github.com/gogits/go-gogs-client/wiki/Repositories#delete +// https://github.com/gogs/go-gogs-client/wiki/Repositories#delete func Delete(c *context.APIContext) { owner, repo := parseOwnerAndRepo(c) if c.Written() { diff --git a/routes/api/v1/user/app.go b/routes/api/v1/user/app.go index bda1e23ff..09ac19093 100644 --- a/routes/api/v1/user/app.go +++ b/routes/api/v1/user/app.go @@ -5,13 +5,13 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) -// https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users#list-access-tokens-for-a-user func ListAccessTokens(c *context.APIContext) { tokens, err := models.ListAccessTokens(c.User.ID) if err != nil { @@ -26,7 +26,7 @@ func ListAccessTokens(c *context.APIContext) { c.JSON(200, &apiTokens) } -// https://github.com/gogits/go-gogs-client/wiki/Users#create-a-access-token +// https://github.com/gogs/go-gogs-client/wiki/Users#create-a-access-token func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) { t := &models.AccessToken{ UID: c.User.ID, diff --git a/routes/api/v1/user/email.go b/routes/api/v1/user/email.go index bd1ea52b4..2e16212cf 100644 --- a/routes/api/v1/user/email.go +++ b/routes/api/v1/user/email.go @@ -5,15 +5,15 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/api/v1/convert" ) -// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user func ListEmails(c *context.APIContext) { emails, err := models.GetEmailAddresses(c.User.ID) if err != nil { @@ -27,7 +27,7 @@ func ListEmails(c *context.APIContext) { c.JSON(200, &apiEmails) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#add-email-addresses +// https://github.com/gogs/go-gogs-client/wiki/Users-Emails#add-email-addresses func AddEmail(c *context.APIContext, form api.CreateEmailOption) { if len(form.Emails) == 0 { c.Status(422) @@ -59,7 +59,7 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) { c.JSON(201, &apiEmails) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#delete-email-addresses +// https://github.com/gogs/go-gogs-client/wiki/Users-Emails#delete-email-addresses func DeleteEmail(c *context.APIContext, form api.CreateEmailOption) { if len(form.Emails) == 0 { c.Status(204) diff --git a/routes/api/v1/user/follower.go b/routes/api/v1/user/follower.go index 6bbd4c7e3..7c743025b 100644 --- a/routes/api/v1/user/follower.go +++ b/routes/api/v1/user/follower.go @@ -5,10 +5,10 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) func responseApiUsers(c *context.APIContext, users []*models.User) { @@ -32,7 +32,7 @@ func ListMyFollowers(c *context.APIContext) { listUserFollowers(c, c.User) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#list-followers-of-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#list-followers-of-a-user func ListFollowers(c *context.APIContext) { u := GetUserByParams(c) if c.Written() { @@ -54,7 +54,7 @@ func ListMyFollowing(c *context.APIContext) { listUserFollowing(c, c.User) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#list-users-followed-by-another-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#list-users-followed-by-another-user func ListFollowing(c *context.APIContext) { u := GetUserByParams(c) if c.Written() { @@ -71,7 +71,7 @@ func checkUserFollowing(c *context.APIContext, u *models.User, followID int64) { } } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#check-if-you-are-following-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#check-if-you-are-following-a-user func CheckMyFollowing(c *context.APIContext) { target := GetUserByParams(c) if c.Written() { @@ -80,7 +80,7 @@ func CheckMyFollowing(c *context.APIContext) { checkUserFollowing(c, c.User, target.ID) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#check-if-one-user-follows-another +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#check-if-one-user-follows-another func CheckFollowing(c *context.APIContext) { u := GetUserByParams(c) if c.Written() { @@ -93,7 +93,7 @@ func CheckFollowing(c *context.APIContext) { checkUserFollowing(c, u, target.ID) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#follow-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#follow-a-user func Follow(c *context.APIContext) { target := GetUserByParams(c) if c.Written() { @@ -106,7 +106,7 @@ func Follow(c *context.APIContext) { c.Status(204) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#unfollow-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Followers#unfollow-a-user func Unfollow(c *context.APIContext) { target := GetUserByParams(c) if c.Written() { diff --git a/routes/api/v1/user/key.go b/routes/api/v1/user/key.go index aef42afc3..97188861d 100644 --- a/routes/api/v1/user/key.go +++ b/routes/api/v1/user/key.go @@ -5,14 +5,14 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/api/v1/convert" - "github.com/gogits/gogs/routes/api/v1/repo" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/api/v1/convert" + "github.com/gogs/gogs/routes/api/v1/repo" ) func GetUserByParamsName(c *context.APIContext, name string) *models.User { @@ -53,12 +53,12 @@ func listPublicKeys(c *context.APIContext, uid int64) { c.JSON(200, &apiKeys) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-your-public-keys +// https://github.com/gogs/go-gogs-client/wiki/Users-Public-Keys#list-your-public-keys func ListMyPublicKeys(c *context.APIContext) { listPublicKeys(c, c.User.ID) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-public-keys-for-a-user +// https://github.com/gogs/go-gogs-client/wiki/Users-Public-Keys#list-public-keys-for-a-user func ListPublicKeys(c *context.APIContext) { user := GetUserByParams(c) if c.Written() { @@ -67,7 +67,7 @@ func ListPublicKeys(c *context.APIContext) { listPublicKeys(c, user.ID) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#get-a-single-public-key +// https://github.com/gogs/go-gogs-client/wiki/Users-Public-Keys#get-a-single-public-key func GetPublicKey(c *context.APIContext) { key, err := models.GetPublicKeyByID(c.ParamsInt64(":id")) if err != nil { @@ -100,12 +100,12 @@ func CreateUserPublicKey(c *context.APIContext, form api.CreateKeyOption, uid in c.JSON(201, convert.ToPublicKey(apiLink, key)) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key +// https://github.com/gogs/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) { CreateUserPublicKey(c, form, c.User.ID) } -// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#delete-a-public-key +// https://github.com/gogs/go-gogs-client/wiki/Users-Public-Keys#delete-a-public-key func DeletePublicKey(c *context.APIContext) { if err := models.DeletePublicKey(c.User, c.ParamsInt64(":id")); err != nil { if models.IsErrKeyAccessDenied(err) { diff --git a/routes/api/v1/user/user.go b/routes/api/v1/user/user.go index 8326eea57..b2af271ba 100644 --- a/routes/api/v1/user/user.go +++ b/routes/api/v1/user/user.go @@ -7,12 +7,12 @@ package user import ( "github.com/Unknwon/com" - api "github.com/gogits/go-gogs-client" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/markup" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/markup" ) func Search(c *context.APIContext) { diff --git a/routes/dev/template.go b/routes/dev/template.go index 00afa5c4b..298f5379c 100644 --- a/routes/dev/template.go +++ b/routes/dev/template.go @@ -5,9 +5,9 @@ package dev import ( - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) func TemplatePreview(c *context.Context) { diff --git a/routes/home.go b/routes/home.go index 29be62947..9835b5569 100644 --- a/routes/home.go +++ b/routes/home.go @@ -7,10 +7,10 @@ package routes import ( "github.com/Unknwon/paginater" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/user" ) const ( diff --git a/routes/install.go b/routes/install.go index 4e8890f7f..e0a3f944c 100644 --- a/routes/install.go +++ b/routes/install.go @@ -17,19 +17,19 @@ import ( "gopkg.in/ini.v1" "gopkg.in/macaron.v1" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/cron" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/ssh" - "github.com/gogits/gogs/pkg/template/highlight" - "github.com/gogits/gogs/pkg/tool" - "github.com/gogits/gogs/pkg/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/cron" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/ssh" + "github.com/gogs/gogs/pkg/template/highlight" + "github.com/gogs/gogs/pkg/tool" + "github.com/gogs/gogs/pkg/user" ) const ( diff --git a/routes/org/members.go b/routes/org/members.go index b529748c6..62021b64d 100644 --- a/routes/org/members.go +++ b/routes/org/members.go @@ -8,10 +8,10 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/org/org.go b/routes/org/org.go index 775e9915d..e00d14feb 100644 --- a/routes/org/org.go +++ b/routes/org/org.go @@ -7,10 +7,10 @@ package org import ( log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/org/setting.go b/routes/org/setting.go index c5083d1a9..59dfdae46 100644 --- a/routes/org/setting.go +++ b/routes/org/setting.go @@ -9,12 +9,12 @@ import ( log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/user" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/user" ) const ( diff --git a/routes/org/teams.go b/routes/org/teams.go index c97d470d0..fa79e9108 100644 --- a/routes/org/teams.go +++ b/routes/org/teams.go @@ -10,10 +10,10 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" ) const ( diff --git a/routes/repo/branch.go b/routes/repo/branch.go index 685df2e74..cd5514b66 100644 --- a/routes/repo/branch.go +++ b/routes/repo/branch.go @@ -9,10 +9,10 @@ import ( log "gopkg.in/clog.v1" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" ) const ( diff --git a/routes/repo/commit.go b/routes/repo/commit.go index 9069f44eb..42de9a366 100644 --- a/routes/repo/commit.go +++ b/routes/repo/commit.go @@ -8,12 +8,12 @@ import ( "container/list" "path" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/download.go b/routes/repo/download.go index e9a29989a..272669c83 100644 --- a/routes/repo/download.go +++ b/routes/repo/download.go @@ -8,11 +8,11 @@ import ( "io" "path" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/pkg/tool" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) func ServeData(c *context.Context, name string, reader io.Reader) error { diff --git a/routes/repo/editor.go b/routes/repo/editor.go index 03f30bdc7..9277c4b4c 100644 --- a/routes/repo/editor.go +++ b/routes/repo/editor.go @@ -13,13 +13,13 @@ import ( log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/git-module" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/http.go b/routes/repo/http.go index 07101661e..15b84347a 100644 --- a/routes/repo/http.go +++ b/routes/repo/http.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/context" - "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/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/issue.go b/routes/repo/issue.go index 70535b2e2..850520e35 100644 --- a/routes/repo/issue.go +++ b/routes/repo/issue.go @@ -17,14 +17,14 @@ import ( "github.com/Unknwon/paginater" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/pull.go b/routes/repo/pull.go index 71199ee28..049cf3686 100644 --- a/routes/repo/pull.go +++ b/routes/repo/pull.go @@ -12,14 +12,14 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.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/context" - "github.com/gogits/gogs/pkg/form" - "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/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/release.go b/routes/repo/release.go index 86dfe6f77..5fdb9eaaa 100644 --- a/routes/repo/release.go +++ b/routes/repo/release.go @@ -10,11 +10,11 @@ import ( log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/repo/repo.go b/routes/repo/repo.go index ea3c1a600..29e2a8e7d 100644 --- a/routes/repo/repo.go +++ b/routes/repo/repo.go @@ -13,14 +13,14 @@ import ( "github.com/Unknwon/com" log "gopkg.in/clog.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/context" - "github.com/gogits/gogs/pkg/form" - "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/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/setting.go b/routes/repo/setting.go index ce96cf24b..7ee3d22bd 100644 --- a/routes/repo/setting.go +++ b/routes/repo/setting.go @@ -11,14 +11,14 @@ import ( log "gopkg.in/clog.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/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/repo/view.go b/routes/repo/view.go index 1ea25d51f..f34ed6773 100644 --- a/routes/repo/view.go +++ b/routes/repo/view.go @@ -15,15 +15,15 @@ import ( "github.com/Unknwon/paginater" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/markup" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/template" - "github.com/gogits/gogs/pkg/template/highlight" - "github.com/gogits/gogs/pkg/tool" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/markup" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" + "github.com/gogs/gogs/pkg/template/highlight" + "github.com/gogs/gogs/pkg/tool" ) const ( diff --git a/routes/repo/webhook.go b/routes/repo/webhook.go index 53e5c5961..b052ddd83 100644 --- a/routes/repo/webhook.go +++ b/routes/repo/webhook.go @@ -11,14 +11,14 @@ import ( "github.com/Unknwon/com" - git "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + git "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "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/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/setting" ) const ( @@ -31,7 +31,7 @@ func Webhooks(c *context.Context) { c.Data["Title"] = c.Tr("repo.settings.hooks") c.Data["PageIsSettingsHooks"] = true c.Data["BaseLink"] = c.Repo.RepoLink - c.Data["Description"] = c.Tr("repo.settings.hooks_desc", "https://github.com/gogits/go-gogs-client/wiki/Repositories-Webhooks") + c.Data["Description"] = c.Tr("repo.settings.hooks_desc", "https://github.com/gogs/go-gogs-client/wiki/Repositories-Webhooks") c.Data["Types"] = setting.Webhook.Types ws, err := models.GetWebhooksByRepoID(c.Repo.Repository.ID) diff --git a/routes/repo/wiki.go b/routes/repo/wiki.go index ad2cfbae6..8035b845e 100644 --- a/routes/repo/wiki.go +++ b/routes/repo/wiki.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/gogits/git-module" + "github.com/gogs/git-module" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/markup" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/markup" ) const ( diff --git a/routes/user/auth.go b/routes/user/auth.go index f7c9d7e83..16e8bd2d7 100644 --- a/routes/user/auth.go +++ b/routes/user/auth.go @@ -11,12 +11,12 @@ import ( "github.com/go-macaron/captcha" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/user/home.go b/routes/user/home.go index c3b9b1822..2ca53eb73 100644 --- a/routes/user/home.go +++ b/routes/user/home.go @@ -11,10 +11,10 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" ) const ( diff --git a/routes/user/profile.go b/routes/user/profile.go index a6eba351e..e42836c6b 100644 --- a/routes/user/profile.go +++ b/routes/user/profile.go @@ -11,11 +11,11 @@ import ( "github.com/Unknwon/paginater" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/routes/repo" + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/routes/repo" ) const ( diff --git a/routes/user/setting.go b/routes/user/setting.go index 35188d670..b893f35ac 100644 --- a/routes/user/setting.go +++ b/routes/user/setting.go @@ -18,13 +18,13 @@ import ( "github.com/pquerna/otp/totp" log "gopkg.in/clog.v1" - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/context" - "github.com/gogits/gogs/pkg/form" - "github.com/gogits/gogs/pkg/mailer" - "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/context" + "github.com/gogs/gogs/pkg/form" + "github.com/gogs/gogs/pkg/mailer" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/tool" ) const (