summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorElvin Efendi <elvin.efendiyev@gmail.com>2016-01-04 11:00:14 -0500
committerElvin Efendi <elvin.efendiyev@gmail.com>2016-01-04 11:00:14 -0500
commite41f7b429901eb38ad785ad1fc2527dd41f35959 (patch)
tree02ba46c4f7d43b5721f3eb7de38599e0e019e5cf /Gemfile.lock
parentef1a59d2b29df5b00246ee34eba96b0cf4927fa2 (diff)
parentf339170c877ca296987d66c0c44223a8cad1d338 (diff)
Merge pull request #17 from Shopify/merge-upstream
Merge upstream
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bbdc4c8..b46ca2f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
PATH
remote: .
specs:
- oxidized (0.8.1)
+ oxidized (0.9.0)
asetus (~> 0.1)
- net-ssh (~> 2.8)
+ net-ssh (~> 3.0, >= 3.0.2)
rugged (~> 0.21, >= 0.21.4)
slop (~> 3.5)
@@ -14,10 +14,10 @@ GEM
coderay (1.1.0)
metaclass (0.0.4)
method_source (0.8.2)
- minitest (5.8.2)
+ minitest (5.8.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
- net-ssh (2.9.2)
+ net-ssh (3.0.2)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -38,4 +38,4 @@ DEPENDENCIES
rake (~> 10.0)
BUNDLED WITH
- 1.10.6
+ 1.11.2