Browse Source

Merge pull request #142 from 0xbaadf00d/feature/gofmt

Normalize files with gofmt
for-closed-social
Thomas Boerger 8 years ago
committed by GitHub
parent
commit
5fc370e332
15 changed files with 26 additions and 26 deletions
  1. +2
    -2
      models/git_diff.go
  2. +1
    -1
      models/issue.go
  3. +3
    -3
      models/pull.go
  4. +4
    -4
      models/repo.go
  5. +1
    -1
      modules/auth/repo_form.go
  6. +2
    -2
      modules/base/tool.go
  7. +1
    -1
      modules/context/api.go
  8. +2
    -2
      modules/context/repo.go
  9. +1
    -1
      routers/repo/commit.go
  10. +1
    -1
      routers/repo/editor.go
  11. +1
    -1
      routers/repo/middlewares.go
  12. +2
    -2
      routers/repo/pull.go
  13. +1
    -1
      routers/repo/release.go
  14. +2
    -2
      routers/repo/view.go
  15. +2
    -2
      routers/user/auth.go

+ 2
- 2
models/git_diff.go View File

@ -16,13 +16,13 @@ import (
"os/exec"
"strings"
"github.com/Unknwon/com"
"code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/template/highlight"
"code.gitea.io/git"
"github.com/Unknwon/com"
"github.com/sergi/go-diff/diffmatchpatch"
"golang.org/x/net/html/charset"
"golang.org/x/text/transform"

+ 1
- 1
models/issue.go View File

@ -14,9 +14,9 @@ import (
"strings"
"time"
api "code.gitea.io/sdk/gitea"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
api "code.gitea.io/sdk/gitea"
gouuid "github.com/satori/go.uuid"
"code.gitea.io/gitea/modules/base"

+ 3
- 3
models/pull.go View File

@ -11,14 +11,14 @@ import (
"strings"
"time"
"github.com/Unknwon/com"
"code.gitea.io/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
"github.com/go-xorm/xorm"
"code.gitea.io/git"
api "code.gitea.io/sdk/gitea"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
)
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

+ 4
- 4
models/repo.go View File

@ -19,17 +19,17 @@ import (
"strings"
"time"
"github.com/Unknwon/cae/zip"
"github.com/Unknwon/com"
"code.gitea.io/git"
"code.gitea.io/gitea/modules/bindata"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
"github.com/go-xorm/xorm"
"code.gitea.io/git"
api "code.gitea.io/sdk/gitea"
"github.com/Unknwon/cae/zip"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
version "github.com/mcuadros/go-version"
ini "gopkg.in/ini.v1"
)

+ 1
- 1
modules/auth/repo_form.go View File

@ -8,8 +8,8 @@ import (
"net/url"
"strings"
"github.com/Unknwon/com"
"code.gitea.io/gitea/models"
"github.com/Unknwon/com"
"github.com/go-macaron/binding"
macaron "gopkg.in/macaron.v1"
)

+ 2
- 2
modules/base/tool.go View File

@ -22,10 +22,10 @@ import (
"unicode"
"unicode/utf8"
"github.com/Unknwon/com"
"github.com/Unknwon/i18n"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/Unknwon/i18n"
"github.com/gogits/chardet"
)

+ 1
- 1
modules/context/api.go View File

@ -8,10 +8,10 @@ import (
"fmt"
"strings"
"github.com/Unknwon/paginater"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/paginater"
macaron "gopkg.in/macaron.v1"
)

+ 2
- 2
modules/context/repo.go View File

@ -10,11 +10,11 @@ import (
"path"
"strings"
"github.com/Unknwon/com"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/git"
"github.com/Unknwon/com"
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
macaron "gopkg.in/macaron.v1"
)

+ 1
- 1
routers/repo/commit.go View File

@ -8,12 +8,12 @@ import (
"container/list"
"path"
"github.com/Unknwon/paginater"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/paginater"
)
const (

+ 1
- 1
routers/repo/editor.go View File

@ -11,6 +11,7 @@ import (
"path"
"strings"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/base"
@ -18,7 +19,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/template"
"code.gitea.io/git"
)
const (

+ 1
- 1
routers/repo/middlewares.go View File

@ -3,9 +3,9 @@ package repo
import (
"fmt"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/git"
)
func SetEditorconfigIfExists(ctx *context.Context) {

+ 2
- 2
routers/repo/pull.go View File

@ -10,14 +10,14 @@ import (
"path"
"strings"
"github.com/Unknwon/com"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/git"
"github.com/Unknwon/com"
)
const (

+ 1
- 1
routers/repo/release.go View File

@ -7,13 +7,13 @@ package repo
import (
"fmt"
"github.com/Unknwon/paginater"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"github.com/Unknwon/paginater"
)
const (

+ 2
- 2
routers/repo/view.go View File

@ -12,7 +12,7 @@ import (
"path"
"strings"
"github.com/Unknwon/paginater"
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
@ -21,7 +21,7 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/template"
"code.gitea.io/gitea/modules/template/highlight"
"code.gitea.io/git"
"github.com/Unknwon/paginater"
)
const (

+ 2
- 2
routers/user/auth.go View File

@ -130,8 +130,8 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) {
// Register last login
u.SetLastLogin()
if err := models.UpdateUser(u); err != nil {
ctx.Handle(500, "UpdateUser", err)
return
ctx.Handle(500, "UpdateUser", err)
return
}
if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {

Loading…
Cancel
Save