mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-11 00:24:21 -04:00
Merge pull request #85 from metalmatze/feature/goimports
Fix imports found by goimports.
This commit is contained in:
commit
92f39da802
32
cmd/web.go
32
cmd/web.go
@ -15,23 +15,6 @@ import (
|
|||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-macaron/binding"
|
|
||||||
"github.com/go-macaron/cache"
|
|
||||||
"github.com/go-macaron/captcha"
|
|
||||||
"github.com/go-macaron/csrf"
|
|
||||||
"github.com/go-macaron/gzip"
|
|
||||||
"github.com/go-macaron/i18n"
|
|
||||||
"github.com/go-macaron/session"
|
|
||||||
"github.com/go-macaron/toolbox"
|
|
||||||
"github.com/go-xorm/xorm"
|
|
||||||
"github.com/mcuadros/go-version"
|
|
||||||
"github.com/urfave/cli"
|
|
||||||
"gopkg.in/ini.v1"
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
"github.com/gogits/go-gogs-client"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/auth"
|
"github.com/go-gitea/gitea/modules/auth"
|
||||||
"github.com/go-gitea/gitea/modules/bindata"
|
"github.com/go-gitea/gitea/modules/bindata"
|
||||||
@ -46,6 +29,21 @@ import (
|
|||||||
"github.com/go-gitea/gitea/routers/org"
|
"github.com/go-gitea/gitea/routers/org"
|
||||||
"github.com/go-gitea/gitea/routers/repo"
|
"github.com/go-gitea/gitea/routers/repo"
|
||||||
"github.com/go-gitea/gitea/routers/user"
|
"github.com/go-gitea/gitea/routers/user"
|
||||||
|
"github.com/go-macaron/binding"
|
||||||
|
"github.com/go-macaron/cache"
|
||||||
|
"github.com/go-macaron/captcha"
|
||||||
|
"github.com/go-macaron/csrf"
|
||||||
|
"github.com/go-macaron/gzip"
|
||||||
|
"github.com/go-macaron/i18n"
|
||||||
|
"github.com/go-macaron/session"
|
||||||
|
"github.com/go-macaron/toolbox"
|
||||||
|
"github.com/go-xorm/xorm"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
|
gogs "github.com/gogits/go-gogs-client"
|
||||||
|
version "github.com/mcuadros/go-version"
|
||||||
|
"github.com/urfave/cli"
|
||||||
|
ini "gopkg.in/ini.v1"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CmdWeb represents the available web sub-command.
|
// CmdWeb represents the available web sub-command.
|
||||||
|
@ -17,17 +17,15 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
"github.com/sergi/go-diff/diffmatchpatch"
|
|
||||||
"golang.org/x/net/html/charset"
|
|
||||||
"golang.org/x/text/transform"
|
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/process"
|
"github.com/go-gitea/gitea/modules/process"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
"github.com/go-gitea/gitea/modules/template/highlight"
|
"github.com/go-gitea/gitea/modules/template/highlight"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
|
"github.com/sergi/go-diff/diffmatchpatch"
|
||||||
|
"golang.org/x/net/html/charset"
|
||||||
|
"golang.org/x/text/transform"
|
||||||
)
|
)
|
||||||
|
|
||||||
type DiffLineType uint8
|
type DiffLineType uint8
|
||||||
|
@ -12,15 +12,13 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
"github.com/go-xorm/xorm"
|
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
api "github.com/gogits/go-gogs-client"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/process"
|
"github.com/go-gitea/gitea/modules/process"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
"github.com/go-gitea/gitea/modules/sync"
|
"github.com/go-gitea/gitea/modules/sync"
|
||||||
|
"github.com/go-xorm/xorm"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
|
api "github.com/gogits/go-gogs-client"
|
||||||
)
|
)
|
||||||
|
|
||||||
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
|
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
|
||||||
|
@ -21,19 +21,17 @@ import (
|
|||||||
|
|
||||||
"github.com/Unknwon/cae/zip"
|
"github.com/Unknwon/cae/zip"
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
"github.com/go-xorm/xorm"
|
|
||||||
"github.com/mcuadros/go-version"
|
|
||||||
"gopkg.in/ini.v1"
|
|
||||||
|
|
||||||
git "github.com/gogits/git-module"
|
|
||||||
api "github.com/gogits/go-gogs-client"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/modules/bindata"
|
"github.com/go-gitea/gitea/modules/bindata"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/markdown"
|
"github.com/go-gitea/gitea/modules/markdown"
|
||||||
"github.com/go-gitea/gitea/modules/process"
|
"github.com/go-gitea/gitea/modules/process"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
"github.com/go-gitea/gitea/modules/sync"
|
"github.com/go-gitea/gitea/modules/sync"
|
||||||
|
"github.com/go-xorm/xorm"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
|
api "github.com/gogits/go-gogs-client"
|
||||||
|
version "github.com/mcuadros/go-version"
|
||||||
|
ini "gopkg.in/ini.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -9,10 +9,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
"github.com/go-macaron/binding"
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
|
"github.com/go-macaron/binding"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// _______________________________________ _________.______________________ _______________.___.
|
// _______________________________________ _________.______________________ _______________.___.
|
||||||
|
@ -9,11 +9,10 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/paginater"
|
"github.com/Unknwon/paginater"
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type APIContext struct {
|
type APIContext struct {
|
||||||
|
@ -7,11 +7,10 @@ package context
|
|||||||
import (
|
import (
|
||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
"github.com/go-macaron/csrf"
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/modules/auth"
|
"github.com/go-gitea/gitea/modules/auth"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
"github.com/go-macaron/csrf"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ToggleOptions struct {
|
type ToggleOptions struct {
|
||||||
|
@ -12,17 +12,16 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-macaron/cache"
|
|
||||||
"github.com/go-macaron/csrf"
|
|
||||||
"github.com/go-macaron/i18n"
|
|
||||||
"github.com/go-macaron/session"
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/auth"
|
"github.com/go-gitea/gitea/modules/auth"
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
"github.com/go-macaron/cache"
|
||||||
|
"github.com/go-macaron/csrf"
|
||||||
|
"github.com/go-macaron/i18n"
|
||||||
|
"github.com/go-macaron/session"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Context represents context of a request.
|
// Context represents context of a request.
|
||||||
|
@ -7,10 +7,9 @@ package context
|
|||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Organization struct {
|
type Organization struct {
|
||||||
|
@ -11,14 +11,12 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
"gopkg.in/editorconfig/editorconfig-core-go.v1"
|
|
||||||
"gopkg.in/macaron.v1"
|
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
|
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
|
||||||
|
macaron "gopkg.in/macaron.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type PullRequest struct {
|
type PullRequest struct {
|
||||||
|
@ -9,13 +9,11 @@ import (
|
|||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/Unknwon/paginater"
|
"github.com/Unknwon/paginater"
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/context"
|
"github.com/go-gitea/gitea/modules/context"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
"github.com/go-gitea/gitea/modules/template"
|
"github.com/go-gitea/gitea/modules/template"
|
||||||
"github.com/gogits/git-module"
|
git "github.com/gogits/git-module"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -5,7 +5,7 @@ import (
|
|||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/context"
|
"github.com/go-gitea/gitea/modules/context"
|
||||||
"github.com/gogits/git-module"
|
git "github.com/gogits/git-module"
|
||||||
)
|
)
|
||||||
|
|
||||||
func SetEditorconfigIfExists(ctx *context.Context) {
|
func SetEditorconfigIfExists(ctx *context.Context) {
|
||||||
|
@ -11,15 +11,13 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/com"
|
"github.com/Unknwon/com"
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/auth"
|
"github.com/go-gitea/gitea/modules/auth"
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/context"
|
"github.com/go-gitea/gitea/modules/context"
|
||||||
"github.com/go-gitea/gitea/modules/log"
|
"github.com/go-gitea/gitea/modules/log"
|
||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -13,9 +13,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Unknwon/paginater"
|
"github.com/Unknwon/paginater"
|
||||||
|
|
||||||
"github.com/gogits/git-module"
|
|
||||||
|
|
||||||
"github.com/go-gitea/gitea/models"
|
"github.com/go-gitea/gitea/models"
|
||||||
"github.com/go-gitea/gitea/modules/base"
|
"github.com/go-gitea/gitea/modules/base"
|
||||||
"github.com/go-gitea/gitea/modules/context"
|
"github.com/go-gitea/gitea/modules/context"
|
||||||
@ -24,6 +21,7 @@ import (
|
|||||||
"github.com/go-gitea/gitea/modules/setting"
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
"github.com/go-gitea/gitea/modules/template"
|
"github.com/go-gitea/gitea/modules/template"
|
||||||
"github.com/go-gitea/gitea/modules/template/highlight"
|
"github.com/go-gitea/gitea/modules/template/highlight"
|
||||||
|
git "github.com/gogits/git-module"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
Loading…
Reference in New Issue
Block a user