diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-06 17:12:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:12:54 -0500 |
| commit | 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 (patch) | |
| tree | 2766bacc1f045fa685ca3d8310cd6174d0311d09 /model | |
| parent | b84bd21089d305333fa4114b95be70f5ad94ad1b (diff) | |
| download | chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.gz chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.bz2 chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.zip | |
app type transition (#7167)
Diffstat (limited to 'model')
| -rw-r--r-- | model/gitlab/gitlab.go | 5 | ||||
| -rw-r--r-- | model/manifest_test.go | 3 | ||||
| -rw-r--r-- | model/websocket_client.go | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go index 7f1447edd..17e0b5081 100644 --- a/model/gitlab/gitlab.go +++ b/model/gitlab/gitlab.go @@ -5,11 +5,12 @@ package oauthgitlab import ( "encoding/json" - "github.com/mattermost/platform/einterfaces" - "github.com/mattermost/platform/model" "io" "strconv" "strings" + + "github.com/mattermost/platform/einterfaces" + "github.com/mattermost/platform/model" ) type GitLabProvider struct { diff --git a/model/manifest_test.go b/model/manifest_test.go index 237640564..46975cf47 100644 --- a/model/manifest_test.go +++ b/model/manifest_test.go @@ -2,13 +2,14 @@ package model import ( "encoding/json" - "gopkg.in/yaml.v2" "io/ioutil" "os" "path/filepath" "strings" "testing" + "gopkg.in/yaml.v2" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/model/websocket_client.go b/model/websocket_client.go index 2fa405f31..8c77e827c 100644 --- a/model/websocket_client.go +++ b/model/websocket_client.go @@ -5,6 +5,7 @@ package model import ( "encoding/json" + "github.com/gorilla/websocket" ) |