Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 01b6c00

Browse filesBrowse files
committed
Merge pull request revel#544 from revel/patch
Patch 0.9.1
2 parents a06d2d7 + 60bcb3a commit 01b6c00
Copy full SHA for 01b6c00

File tree

Expand file treeCollapse file tree

11 files changed

+265
-10
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

11 files changed

+265
-10
lines changed
Open diff view settings
Collapse file

‎cache/inmemory.go‎

Copy file name to clipboardExpand all lines: cache/inmemory.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package cache
22

33
import (
44
"fmt"
5-
"github.com/robfig/go-cache"
65
"github.com/revel/revel"
6+
"github.com/robfig/go-cache"
77
"reflect"
88
"time"
99
)
Collapse file

‎cache/memcached.go‎

Copy file name to clipboardExpand all lines: cache/memcached.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package cache
22

33
import (
44
"errors"
5-
"github.com/robfig/gomemcache/memcache"
65
"github.com/revel/revel"
6+
"github.com/robfig/gomemcache/memcache"
77
"time"
88
)
99

Collapse file

‎harness/build.go‎

Copy file name to clipboardExpand all lines: harness/build.go
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ func getAppVersion() string {
123123
}
124124

125125
if gitPath, err := exec.LookPath("git"); err == nil {
126-
gitCmd := exec.Command(gitPath, "describe", "--always", "--dirty")
126+
var gitdir = "--git-dir=" + path.Join(revel.BasePath, ".git")
127+
gitCmd := exec.Command(gitPath, gitdir, "describe", "--always", "--dirty")
127128
revel.TRACE.Println("Exec:", gitCmd.Args)
128129
output, err := gitCmd.Output()
129130

Collapse file

‎modules/jobs/app/controllers/status.go‎

Copy file name to clipboardExpand all lines: modules/jobs/app/controllers/status.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package controllers
22

33
import (
4-
"github.com/robfig/cron"
54
"github.com/revel/revel"
65
"github.com/revel/revel/modules/jobs/app/jobs"
6+
"github.com/robfig/cron"
77
"strings"
88
)
99

Collapse file

‎modules/jobs/app/jobs/job.go‎

Copy file name to clipboardExpand all lines: modules/jobs/app/jobs/job.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package jobs
22

33
import (
4-
"github.com/robfig/cron"
54
"github.com/revel/revel"
5+
"github.com/robfig/cron"
66
"reflect"
77
"runtime/debug"
88
"sync"
Collapse file

‎modules/jobs/app/jobs/jobrunner.go‎

Copy file name to clipboardExpand all lines: modules/jobs/app/jobs/jobrunner.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
package jobs
1212

1313
import (
14-
"github.com/robfig/cron"
1514
"github.com/revel/revel"
15+
"github.com/robfig/cron"
1616
"strings"
1717
"time"
1818
)
Collapse file

‎modules/jobs/app/jobs/plugin.go‎

Copy file name to clipboardExpand all lines: modules/jobs/app/jobs/plugin.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package jobs
22

33
import (
44
"fmt"
5-
"github.com/robfig/cron"
65
"github.com/revel/revel"
6+
"github.com/robfig/cron"
77
)
88

99
const DEFAULT_JOB_POOL_SIZE = 10
Collapse file

‎samples/booking/app/jobs/count.go‎

Copy file name to clipboardExpand all lines: samples/booking/app/jobs/count.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type BookingCounter struct{}
1313

1414
func (c BookingCounter) Run() {
1515
bookings, err := controllers.Dbm.Select(models.Booking{},
16-
`select * from Booking`)
16+
`select * from Booking`)
1717
if err != nil {
1818
panic(err)
1919
}
Collapse file

‎samples/facebook-oauth2/app/controllers/app.go‎

Copy file name to clipboardExpand all lines: samples/facebook-oauth2/app/controllers/app.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package controllers
22

33
import (
4+
"code.google.com/p/goauth2/oauth"
45
"encoding/json"
56
"fmt"
6-
"code.google.com/p/goauth2/oauth"
77
"github.com/revel/revel"
88
"github.com/revel/revel/samples/facebook-oauth2/app/models"
99
"net/http"
Collapse file

‎validators.go‎

Copy file name to clipboardExpand all lines: validators.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ type Email struct {
200200
Match
201201
}
202202

203-
func VaildEmail() Email {
203+
func ValidEmail() Email {
204204
return Email{Match{emailPattern}}
205205
}
206206

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.