diff --git a/Gemfile.lock b/Gemfile.lock index 099d47e..5ba3f42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,100 +1,94 @@ PATH remote: . specs: - sir-trevor-rails (0.2.2) + sir-trevor-rails (0.2.4) activesupport (>= 3.0.7) jquery-rails rails (>= 3.0.7) - redcarpet (~> 2.0.1) + redcarpet (~> 3.0.0) twitter-text (~> 1.4) GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) + actionmailer (4.0.0) + actionpack (= 4.0.0) mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) + actionpack (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) - multi_json (~> 1.0) - arel (3.0.2) - builder (3.0.4) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + activerecord (4.0.0) + activemodel (= 4.0.0) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.0) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.0) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + arel (4.0.0) + atomic (1.1.14) + builder (3.1.4) erubis (2.7.0) - hike (1.2.2) - i18n (0.6.1) - journey (1.0.4) - jquery-rails (2.2.1) + hike (1.2.3) + i18n (0.6.5) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) - multi_json (1.7.2) + mime-types (1.25) + minitest (4.7.5) + multi_json (1.8.2) polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack + rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) - bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) - rack-ssl (~> 1.3.2) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.0) + sprockets-rails (~> 2.0.0) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.0.4) - rdoc (3.12.2) - json (~> 1.4) - redcarpet (2.0.1) - sprockets (2.2.2) + thor (>= 0.18.1, < 2.0) + rake (10.1.0) + redcarpet (3.0.0) + sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) thor (0.18.1) - tilt (1.3.7) - treetop (1.4.12) + thread_safe (0.1.3) + atomic + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter-text (1.6.1) - unf (~> 0.0.5) - tzinfo (0.3.37) - unf (0.0.5) + twitter-text (1.6.3) + unf (~> 0.1.0) + tzinfo (0.3.38) + unf (0.1.2) unf_ext unf_ext (0.0.6) diff --git a/sir-trevor-rails.gemspec b/sir-trevor-rails.gemspec index 3f66196..43fc815 100644 --- a/sir-trevor-rails.gemspec +++ b/sir-trevor-rails.gemspec @@ -19,11 +19,11 @@ Gem::Specification.new do |s| s.add_dependency "rails" , ">= 3.0.7" s.add_dependency "jquery-rails" - s.add_dependency "redcarpet", "~> 2.0.1" + s.add_dependency "redcarpet", "~> 3.0.0" s.add_dependency 'twitter-text', '~> 1.4' s.files = `git ls-files`.split("\n") s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact s.require_path = 'lib' -end \ No newline at end of file +end