Merge pull request #6 from BytemarkHosting/release-to-masterHEADmaster

Release to master

1 files changed, 31 insertions, 29 deletions

diff --git a/Gemfile b/Gemfile
index 87cffd8..4fc00ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,36 +1,38 @@
 source "https://rubygems.org"
 
+gem "ruby_protobuf",  "~> 0.4.11"
+gem "datamapper"
+gem "dm-aggregates"
+gem "dm-do-adapter"
+gem "dm-migrations"
+gem "dm-postgres-adapter"
+gem "dm-sqlite-adapter"
+gem "dm-transactions"
+gem "dm-types"
+gem "dm-validations"
 
-gem "bcrypt-ruby",    "=3.0.1"
-gem "timecop",   "=0.3.5"
-gem "log4r",     "=1.0.6"
-gem "ipaddress", "=0.8.0"
-gem "webmock",   "=1.7.6"
-gem "ruby_protobuf",  "=0.4.11"
-gem "json",      "=1.5.4"
-gem "datamapper", "=1.2.0"
-gem "dm-aggregates", "=1.2.0"
-gem "dm-do-adapter", "=1.2.0"
-gem "dm-migrations", "=1.2.0"
-gem "dm-postgres-adapter", "=1.2.0"
-gem "dm-sqlite-adapter", "=1.2.0"
-gem "dm-transactions", "=1.2.0"
-gem "dm-types", "=1.2.0"
-gem "dm-validations", "=1.2.0"
-gem "sanitize", "=2.0.3"
-gem "rmail", "=1.1.0"
-gem "xmpp4r", "=0.5.6"
-gem "thin", "=1.6.3"
-gem "haml", "=3.0.15"
-gem "RedCloth"
-gem "rack"
-gem "rack-protection"
-gem "rack-test"
-gem "rack-flash3"
-gem "tilt", "=1.3.3"
-gem "sinatra", "=1.4.6"
-gem "locale", "=2.1.0"
+#
+# The versions here are to match Jessie
+#
+gem "log4r",     "~> 1.1.10"
+gem "ipaddress", "~> 0.8.0"
+gem "json",      "~> 1.8.1"
+gem "sanitize",  "~> 2.1.0"
+gem "rmail",     "~> 1.1.0"
+gem "thin",      "~> 1.6.3"
+gem "haml",       "~> 4.0.5"
+gem "haml-contrib", "~> 1.0.0"
+gem "RedCloth",   "~> 4.2.9"
+gem "rack",       "~> 1.5.2"
+gem "rack-protection", "~> 1.5.2"
+gem "rack-flash3", "~> 1.0.5"
+gem "tilt",        "~> 1.4.1"
+gem "sinatra",     "~> 1.4.5"
 
 group :test do
+  gem "locale",      "~> 2.1.0"
   gem "simplecov", :require => false
+  gem "rack-test", "~> 0.6.3"
+  gem "webmock",   "~> 1.19.0"
+  gem "timecop",   "~> 0.7.1"
 end