aboutsummaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authortelyn <telyn@bytemark.co.uk>2018-01-30 10:19:59 +0000
committertelyn <telyn@bytemark.co.uk>2018-01-30 10:19:59 +0000
commitb37a469b817e55b06b8d6a22c1087506a2221c14 (patch)
tree5c5f5510b389c31ee8686e07b451e22738d4c253 /Gemfile.lock
parent0139aa17ab739365745c3447de5634b665391a77 (diff)
parent9bdd63df6f71ea7322f3d65aa88a79cb17d74b9c (diff)
Merge branch 'develop' into gem
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock22
1 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 716949f..21cdb41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,14 +2,14 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.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.4)
+ daemons (1.2.6)
data_objects (0.10.17)
addressable (~> 2.1)
datamapper (1.2.0)
@@ -75,11 +75,11 @@ GEM
json_pure (1.8.6)
locale (2.1.2)
log4r (1.1.10)
- mini_portile2 (2.2.0)
- multi_json (1.12.1)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
- public_suffix (2.0.5)
+ 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
@@ -92,11 +92,11 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- simplecov (0.14.1)
+ simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.1)
+ simplecov-html (0.10.2)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
@@ -148,4 +148,4 @@ DEPENDENCIES
webmock (~> 1.19.0)
BUNDLED WITH
- 1.13.6
+ 1.16.0