Permalink
Browse files
loose dependency on safe_yaml
- Loading branch information...
Showing
with
12 additions
and
12 deletions.
-
+11
−11
Gemfile.lock
-
+1
−1
tolk.gemspec
|
|
@@ -34,7 +34,7 @@ GEM |
|
|
rack (>= 1.0.0)
|
|
|
rack-test (>= 0.5.4)
|
|
|
xpath (~> 2.0)
|
|
|
- childprocess (0.5.2)
|
|
|
+ childprocess (0.5.3)
|
|
|
ffi (~> 1.0, >= 1.0.11)
|
|
|
erubis (2.7.0)
|
|
|
factory_girl (4.4.0)
|
|
|
@@ -52,13 +52,13 @@ GEM |
|
|
treetop (~> 1.4.8)
|
|
|
metaclass (0.0.4)
|
|
|
mime-types (1.25.1)
|
|
|
- mini_portile (0.5.3)
|
|
|
+ mini_portile (0.6.0)
|
|
|
minitest (4.7.5)
|
|
|
- mocha (1.0.0)
|
|
|
+ mocha (1.1.0)
|
|
|
metaclass (~> 0.0.1)
|
|
|
- multi_json (1.9.2)
|
|
|
- nokogiri (1.6.1)
|
|
|
- mini_portile (~> 0.5.0)
|
|
|
+ multi_json (1.10.1)
|
|
|
+ nokogiri (1.6.2.1)
|
|
|
+ mini_portile (= 0.6.0)
|
|
|
polyglot (0.3.4)
|
|
|
rack (1.5.2)
|
|
|
rack-test (0.6.2)
|
|
|
@@ -76,15 +76,15 @@ GEM |
|
|
activesupport (= 4.0.2)
|
|
|
rake (>= 0.8.7)
|
|
|
thor (>= 0.18.1, < 2.0)
|
|
|
- rake (10.2.2)
|
|
|
+ rake (10.3.2)
|
|
|
rubyzip (1.1.3)
|
|
|
- safe_yaml (1.0.2)
|
|
|
- selenium-webdriver (2.41.0)
|
|
|
+ safe_yaml (1.0.3)
|
|
|
+ selenium-webdriver (2.42.0)
|
|
|
childprocess (>= 0.5.0)
|
|
|
multi_json (~> 1.0)
|
|
|
rubyzip (~> 1.0)
|
|
|
websocket (~> 1.0.4)
|
|
|
- sprockets (2.12.0)
|
|
|
+ sprockets (2.12.1)
|
|
|
hike (~> 1.2)
|
|
|
multi_json (~> 1.0)
|
|
|
rack (~> 1.0)
|
|
|
@@ -95,7 +95,7 @@ GEM |
|
|
sprockets (~> 2.8)
|
|
|
sqlite3 (1.3.9)
|
|
|
thor (0.19.1)
|
|
|
- thread_safe (0.3.3)
|
|
|
+ thread_safe (0.3.4)
|
|
|
tilt (1.4.1)
|
|
|
treetop (1.4.15)
|
|
|
polyglot
|
|
|
|
|
|
@@ -14,7 +14,7 @@ Gem::Specification.new do |s| |
|
|
|
|
|
s.platform = Gem::Platform::RUBY
|
|
|
s.add_dependency('will_paginate')
|
|
|
- s.add_dependency('safe_yaml', "~> 0.8")
|
|
|
+ s.add_dependency('safe_yaml', ">= 0.8")
|
|
|
if File.exists?('UPGRADING')
|
|
|
s.post_install_message = File.read("UPGRADING")
|
|
|
end
|
|
|
|
0 comments on commit
df1d8bc