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

Release to master

1 files changed, 88 insertions, 80 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 8a4017f..21cdb41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,12 +2,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.3.8)
-    bcrypt-ruby (3.0.1)
-    crack (0.4.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    bcrypt (3.1.11)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.2)
-    data_objects (0.10.15)
+    daemons (1.2.6)
+    data_objects (0.10.17)
       addressable (~> 2.1)
     datamapper (1.2.0)
       dm-aggregates (~> 1.2.0)
@@ -33,12 +36,12 @@ GEM
     dm-postgres-adapter (1.2.0)
       dm-do-adapter (~> 1.2.0)
       do_postgres (~> 0.10.6)
-    dm-serializer (1.2.0)
+    dm-serializer (1.2.2)
       dm-core (~> 1.2.0)
-      fastercsv (~> 1.5.4)
-      json (~> 1.5.4)
-      json_pure (~> 1.5.4)
-      multi_json (~> 1.0.3)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      json_pure (~> 1.6)
+      multi_json (~> 1.0)
     dm-sqlite-adapter (1.2.0)
       dm-do-adapter (~> 1.2.0)
       do_sqlite3 (~> 0.10.6)
@@ -46,98 +49,103 @@ GEM
       dm-core (~> 1.2.0)
     dm-transactions (1.2.0)
       dm-core (~> 1.2.0)
-    dm-types (1.2.0)
-      bcrypt-ruby (~> 3.0.0)
+    dm-types (1.2.2)
+      bcrypt-ruby (~> 3.0)
       dm-core (~> 1.2.0)
-      fastercsv (~> 1.5.4)
-      json (~> 1.5.4)
-      multi_json (~> 1.0.3)
-      stringex (~> 1.3.0)
-      uuidtools (~> 2.1.2)
+      fastercsv (~> 1.5)
+      json (~> 1.6)
+      multi_json (~> 1.0)
+      stringex (~> 1.4)
+      uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_postgres (0.10.15)
-      data_objects (= 0.10.15)
-    do_sqlite3 (0.10.15)
-      data_objects (= 0.10.15)
+    do_postgres (0.10.17)
+      data_objects (= 0.10.17)
+    do_sqlite3 (0.10.17)
+      data_objects (= 0.10.17)
     docile (1.1.5)
-    eventmachine (1.0.7)
+    eventmachine (1.2.5)
     fastercsv (1.5.5)
-    haml (3.0.15)
-    ipaddress (0.8.0)
-    json (1.5.4)
-    json_pure (1.5.5)
-      spruz (~> 0.2.8)
-    locale (2.1.0)
-    log4r (1.0.6)
-    multi_json (1.0.4)
-    nokogiri (1.5.11)
-    rack (1.6.0)
+    haml (4.0.7)
+      tilt
+    haml-contrib (1.0.0.1)
+      haml (>= 3.2.0.alpha.13)
+    ipaddress (0.8.3)
+    json (1.8.6)
+    json_pure (1.8.6)
+    locale (2.1.2)
+    log4r (1.1.10)
+    mini_portile2 (2.3.0)
+    multi_json (1.13.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    public_suffix (3.0.1)
+    rack (1.5.5)
     rack-flash3 (1.0.5)
       rack
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rmail (1.1.0)
+    rmail (1.1.3)
     ruby_protobuf (0.4.11)
     safe_yaml (1.0.4)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    simplecov (0.9.2)
+    sanitize (2.1.0)
+      nokogiri (>= 1.4.4)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    spruz (0.2.13)
-    stringex (1.3.3)
-    thin (1.6.3)
+    stringex (1.5.1)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
-    tilt (1.3.3)
-    timecop (0.3.5)
+    tilt (1.4.1)
+    timecop (0.7.4)
     uuidtools (2.1.5)
-    webmock (1.7.6)
-      addressable (~> 2.2, > 2.2.5)
-      crack (>= 0.1.7)
-    xmpp4r (0.5.6)
+    webmock (1.19.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth
-  bcrypt-ruby (= 3.0.1)
-  datamapper (= 1.2.0)
-  dm-aggregates (= 1.2.0)
-  dm-do-adapter (= 1.2.0)
-  dm-migrations (= 1.2.0)
-  dm-postgres-adapter (= 1.2.0)
-  dm-sqlite-adapter (= 1.2.0)
-  dm-transactions (= 1.2.0)
-  dm-types (= 1.2.0)
-  dm-validations (= 1.2.0)
-  haml (= 3.0.15)
-  ipaddress (= 0.8.0)
-  json (= 1.5.4)
-  locale (= 2.1.0)
-  log4r (= 1.0.6)
-  rack
-  rack-flash3
-  rack-protection
-  rack-test
-  rmail (= 1.1.0)
-  ruby_protobuf (= 0.4.11)
-  sanitize (= 2.0.3)
+  RedCloth (~> 4.2.9)
+  datamapper
+  dm-aggregates
+  dm-do-adapter
+  dm-migrations
+  dm-postgres-adapter
+  dm-sqlite-adapter
+  dm-transactions
+  dm-types
+  dm-validations
+  haml (~> 4.0.5)
+  haml-contrib (~> 1.0.0)
+  ipaddress (~> 0.8.0)
+  json (~> 1.8.1)
+  locale (~> 2.1.0)
+  log4r (~> 1.1.10)
+  rack (~> 1.5.2)
+  rack-flash3 (~> 1.0.5)
+  rack-protection (~> 1.5.2)
+  rack-test (~> 0.6.3)
+  rmail (~> 1.1.0)
+  ruby_protobuf (~> 0.4.11)
+  sanitize (~> 2.1.0)
   simplecov
-  sinatra (= 1.4.6)
-  thin (= 1.6.3)
-  tilt (= 1.3.3)
-  timecop (= 0.3.5)
-  webmock (= 1.7.6)
-  xmpp4r (= 0.5.6)
+  sinatra (~> 1.4.5)
+  thin (~> 1.6.3)
+  tilt (~> 1.4.1)
+  timecop (~> 0.7.1)
+  webmock (~> 1.19.0)
+
+BUNDLED WITH
+   1.16.0