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 612a8a0

Browse filesBrowse files
authored
Merge branch 'develop' into feature/contribution-guide-fix
2 parents 159792c + 2b85e8d commit 612a8a0
Copy full SHA for 612a8a0

File tree

4 files changed

+12
-6
lines changed
Filter options

4 files changed

+12
-6
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+9-3Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ go:
44
- 1.4
55
- 1.5
66
- 1.6
7+
- 1.7
8+
- 1.8
79
- tip
810

911
os:
@@ -24,9 +26,13 @@ services:
2426

2527
before_install:
2628
# TRAVIS_OS_NAME - linux and osx
27-
- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install memcached redis; fi'
28-
- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup /usr/local/opt/memcached/bin/memcached & fi'
29-
- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup redis-server /usr/local/etc/redis.conf & fi'
29+
- echo $TRAVIS_OS_NAME
30+
- |
31+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
32+
brew update && brew install memcached redis && brew services start redis && brew services start memcached
33+
fi
34+
- redis-server --daemonize yes
35+
- redis-cli info
3036

3137
install:
3238
# Setting environments variables

‎filterconfig.go

Copy file name to clipboardExpand all lines: filterconfig.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func newFilterConfigurator(controllerName, methodName string) FilterConfigurator
6666

6767
// FilterController returns a configurator for the filters applied to all
6868
// actions on the given controller instance. For example:
69-
// FilterAction(MyController{})
69+
// FilterController(MyController{})
7070
func FilterController(controllerInstance interface{}) FilterConfigurator {
7171
t := reflect.TypeOf(controllerInstance)
7272
for t.Kind() == reflect.Ptr {

‎revel.go

Copy file name to clipboardExpand all lines: revel.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func Init(mode, importPath, srcPath string) {
204204
AppRoot = Config.StringDefault("app.root", "")
205205
CookiePrefix = Config.StringDefault("cookie.prefix", "REVEL")
206206
CookieDomain = Config.StringDefault("cookie.domain", "")
207-
CookieSecure = Config.BoolDefault("cookie.secure", !DevMode)
207+
CookieSecure = Config.BoolDefault("cookie.secure", HTTPSsl)
208208
TemplateDelims = Config.StringDefault("template.delimiters", "")
209209
if secretStr := Config.StringDefault("app.secret", ""); secretStr != "" {
210210
secretKey = []byte(secretStr)

‎testing/testsuite_test.go

Copy file name to clipboardExpand all lines: testing/testsuite_test.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {
7676

7777
testSuite.AssertOk()
7878
testSuite.AssertContentType("application/json")
79-
testSuite.AssertHeader("Server", "nginx")
79+
testSuite.AssertHeader("Server", "gunicorn/19.7.0")
8080
testSuite.AssertContains("httpbin.org")
8181
testSuite.AssertContainsRegex("gzip|deflate")
8282
}

0 commit comments

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