diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-16 18:13:16 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-16 18:13:16 -0700 |
| commit | b9d5b4e5dcc1585397f1e1d2e53c5f040ee76220 (patch) | |
| tree | 85d2c293aa3456182a754fefe6646162b516eb6c /model | |
| parent | e101b2cf7c172d1c4ff20e0df63917b5b8f923ed (diff) | |
| parent | cba59d4eb6ef0f65304bc72339c676ebfd653e2b (diff) | |
| download | chat-b9d5b4e5dcc1585397f1e1d2e53c5f040ee76220.tar.gz chat-b9d5b4e5dcc1585397f1e1d2e53c5f040ee76220.tar.bz2 chat-b9d5b4e5dcc1585397f1e1d2e53c5f040ee76220.zip | |
merging files
Diffstat (limited to 'model')
| -rw-r--r-- | model/file_info_test.go | 2 | ||||
| -rw-r--r-- | model/version.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/model/file_info_test.go b/model/file_info_test.go index e89681626..7003d1e83 100644 --- a/model/file_info_test.go +++ b/model/file_info_test.go @@ -56,7 +56,7 @@ func TestGetInfoForBytes(t *testing.T) { t.Fatalf("Got HasPreviewImage = false for static gif") } - animatedGifFile, err := ioutil.ReadFile("../web/static/images/testgif.gif") + animatedGifFile, err := ioutil.ReadFile("../tests/testgif.gif") if err != nil { t.Fatalf("Failed to load testgif.gif: %v", err.Error()) } diff --git a/model/version.go b/model/version.go index 6011a9245..737071934 100644 --- a/model/version.go +++ b/model/version.go @@ -118,5 +118,10 @@ func IsPreviousVersionsSupported(versionToCheck string) bool { return true } + // Current - 3 Supported + if versionsWithoutHotFixes[3] == versionToCheckStr { + return true + } + return false } |