diff options
| author | Yuri Tkachenko <yuri.tam.tkachenko@gmail.com> | 2015-11-30 12:15:28 +0300 |
|---|---|---|
| committer | Yuri Tkachenko <yuri.tam.tkachenko@gmail.com> | 2015-11-30 12:15:28 +0300 |
| commit | 8b982f7effa336a503ab61c676ee0f2473de6e3b (patch) | |
| tree | ecd49a12e3cb9e4bff398057df01d44eade70da4 /model | |
| parent | 71b548ef052d4e84ea0d067df51e4850ffdba572 (diff) | |
| parent | d4eb8743e3bd36b6cd2e7939c9a698d893b215d7 (diff) | |
| download | chat-8b982f7effa336a503ab61c676ee0f2473de6e3b.tar.gz chat-8b982f7effa336a503ab61c676ee0f2473de6e3b.tar.bz2 chat-8b982f7effa336a503ab61c676ee0f2473de6e3b.zip | |
Merge remote-tracking branch 'mattermost/master' into patch-1
Diffstat (limited to 'model')
| -rw-r--r-- | model/preference.go | 1 | ||||
| -rw-r--r-- | model/user.go | 2 | ||||
| -rw-r--r-- | model/utils.go | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/model/preference.go b/model/preference.go index 892ae82aa..4f2ba0099 100644 --- a/model/preference.go +++ b/model/preference.go @@ -12,6 +12,7 @@ import ( const ( PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show" PREFERENCE_CATEGORY_TUTORIAL_STEPS = "tutorial_step" + PREFERENCE_CATEGORY_ADVANCED_SETTINGS = "advanced_settings" ) type Preference struct { diff --git a/model/user.go b/model/user.go index 77dc04a03..4ba35c6c4 100644 --- a/model/user.go +++ b/model/user.go @@ -4,9 +4,9 @@ package model import ( - "code.google.com/p/go.crypto/bcrypt" "encoding/json" "fmt" + "golang.org/x/crypto/bcrypt" "io" "regexp" "strings" diff --git a/model/utils.go b/model/utils.go index ff26bfc66..b49b4bb24 100644 --- a/model/utils.go +++ b/model/utils.go @@ -5,10 +5,10 @@ package model import ( "bytes" - "code.google.com/p/go-uuid/uuid" "encoding/base32" "encoding/json" "fmt" + "github.com/pborman/uuid" "io" "net/mail" "net/url" |