summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2016-01-01 18:41:59 +0100
committerHarald Eilertsen <haraldei@anduin.net>2016-01-01 18:41:59 +0100
commit20db5a0042a3e2f10d6eb9a0c1853463cf43fa4e (patch)
tree4c5fcfae6cb5f034f8fe5007e28a4e384a960cef
parent46636b7984220677e886b92174c2fb36aa5492c6 (diff)
downloadnorsk-urskog-registrations-20db5a0042a3e2f10d6eb9a0c1853463cf43fa4e.tar.gz
norsk-urskog-registrations-20db5a0042a3e2f10d6eb9a0c1853463cf43fa4e.tar.bz2
norsk-urskog-registrations-20db5a0042a3e2f10d6eb9a0c1853463cf43fa4e.zip
Update dependencies.
-rw-r--r--Gemfile.lock56
1 files changed, 27 insertions, 29 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 812e550..dc1a8b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.2.4)
+ activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- backports (3.6.6)
- byebug (6.0.2)
+ backports (3.6.7)
+ byebug (8.2.1)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
@@ -16,7 +16,7 @@ GEM
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
- capistrano-passenger (0.1.1)
+ capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
@@ -27,34 +27,33 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- childprocess (0.5.6)
+ childprocess (0.5.8)
ffi (~> 1.0, >= 1.0.11)
- colorize (0.7.7)
daemons (1.2.3)
diff-lcs (1.2.5)
- eventmachine (1.0.5)
+ eventmachine (1.0.8)
ffi (1.9.10)
i18n (0.7.0)
json (1.8.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
- mailcatcher (0.6.1)
+ mailcatcher (0.6.2)
activesupport (>= 4.0.0, < 5)
- eventmachine (~> 1.0.0, <= 1.0.5)
+ eventmachine (= 1.0.8)
mail (~> 2.3)
sinatra (~> 1.2)
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
- mime-types (2.6.2)
- mini_portile (0.6.2)
- minitest (5.8.2)
+ mime-types (2.99)
+ mini_portile2 (2.0.0)
+ minitest (5.8.3)
multi_json (1.11.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
- net-ssh (3.0.1)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
+ net-ssh (3.0.2)
+ nokogiri (1.6.7.1)
+ mini_portile2 (~> 2.0.0.rc2)
pdf-core (0.6.0)
prawn (2.0.2)
pdf-core (~> 0.6.0)
@@ -65,21 +64,21 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
- rspec (3.3.0)
- rspec-core (~> 3.3.0)
- rspec-expectations (~> 3.3.0)
- rspec-mocks (~> 3.3.0)
- rspec-core (3.3.2)
- rspec-support (~> 3.3.0)
- rspec-expectations (3.3.1)
+ rspec (3.4.0)
+ rspec-core (~> 3.4.0)
+ rspec-expectations (~> 3.4.0)
+ rspec-mocks (~> 3.4.0)
+ rspec-core (3.4.1)
+ rspec-support (~> 3.4.0)
+ rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.3.0)
- rspec-mocks (3.3.2)
+ rspec-support (~> 3.4.0)
+ rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.3.0)
- rspec-support (3.3.0)
+ rspec-support (~> 3.4.0)
+ rspec-support (3.4.1)
rubyzip (1.1.7)
- selenium-webdriver (2.47.1)
+ selenium-webdriver (2.48.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
@@ -103,8 +102,7 @@ GEM
eventmachine (~> 1.0.0)
thin (~> 1.5.0)
sqlite3 (1.3.11)
- sshkit (1.7.1)
- colorize (>= 0.7.0)
+ sshkit (1.8.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thin (1.5.1)