diff --git a/Gemfile b/Gemfile index 4b28259..759da1e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.5' +gem 'rails', '3.0.10' gem 'nokogiri' gem 'mongoid', '2.1.2' gem 'haml' @@ -16,7 +16,7 @@ gem 'octokit' gem 'inherited_resources' gem 'SystemTimer', :platform => :ruby_18 gem 'hoptoad_notifier', "~> 2.4" -gem 'actionmailer_inline_css', ">= 1.0.0" +gem 'actionmailer_inline_css', ">= 1.0.1" platform :ruby do gem 'bson_ext', '~> 1.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index f955b68..9c10f44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,39 +10,39 @@ GEM specs: SystemTimer (1.2.3) abstract (1.0.0) - actionmailer (3.0.5) - actionpack (= 3.0.5) - mail (~> 2.2.15) - actionmailer_inline_css (1.0.0) + actionmailer (3.0.10) + actionpack (= 3.0.10) + mail (~> 2.2.19) + actionmailer_inline_css (1.0.1) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) - actionpack (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) + actionpack (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) erubis (~> 2.6.6) - i18n (~> 0.4) + i18n (~> 0.5.0) rack (~> 1.2.1) - rack-mount (~> 0.6.13) + rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.5) - activesupport (= 3.0.5) + activemodel (3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) - i18n (~> 0.4) - activerecord (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - arel (~> 2.0.2) + i18n (~> 0.5.0) + activerecord (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - activesupport (3.0.5) + activeresource (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + activesupport (3.0.10) addressable (2.2.5) archive-tar-minitar (0.5.2) - arel (2.0.9) + arel (2.0.10) bcrypt-ruby (2.1.4) bson (1.3.1) bson_ext (1.3.1) @@ -93,7 +93,7 @@ GEM rbx-require-relative (> 0.0.4) linecache19 (0.5.12) ruby_core_source (>= 0.1.4) - mail (2.2.17) + mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -126,32 +126,34 @@ GEM happymapper (>= 0.2.4) nokogiri (~> 1.4.1) rest-client (~> 1.5.1) - polyglot (0.3.1) + polyglot (0.3.2) premailer (1.7.1) css_parser (>= 1.1.9) htmlentities (>= 4.0.0) - rack (1.2.2) + rack (1.2.3) rack-mount (0.6.14) rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.5) - actionmailer (= 3.0.5) - actionpack (= 3.0.5) - activerecord (= 3.0.5) - activeresource (= 3.0.5) - activesupport (= 3.0.5) + rails (3.0.10) + actionmailer (= 3.0.10) + actionpack (= 3.0.10) + activerecord (= 3.0.10) + activeresource (= 3.0.10) + activesupport (= 3.0.10) bundler (~> 1.0) - railties (= 3.0.5) - railties (3.0.5) - actionpack (= 3.0.5) - activesupport (= 3.0.5) + railties (= 3.0.10) + railties (3.0.10) + actionpack (= 3.0.10) + activesupport (= 3.0.10) rake (>= 0.8.7) + rdoc (~> 3.4) thor (~> 0.14.4) - rake (0.8.7) + rake (0.9.2) rash (0.3.0) hashie (~> 1.0.0) rbx-require-relative (0.0.5) + rdoc (3.9.4) responders (0.6.4) rest-client (1.5.1) mime-types (>= 1.16) @@ -191,12 +193,13 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - treetop (1.4.9) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) typhoeus (0.2.4) mime-types mime-types - tzinfo (0.3.26) + tzinfo (0.3.29) useragent (0.3.1) warden (1.0.5) rack (>= 1.0) @@ -210,7 +213,7 @@ PLATFORMS DEPENDENCIES SystemTimer - actionmailer_inline_css (>= 1.0.0) + actionmailer_inline_css (>= 1.0.1) bson_ext (~> 1.3.1) database_cleaner (~> 0.6.0) devise (~> 1.4.0) @@ -225,7 +228,7 @@ DEPENDENCIES nokogiri octokit pivotal-tracker - rails (= 3.0.5) + rails (= 3.0.10) redmine_client! rspec (~> 2.5) rspec-rails (~> 2.5) -- libgit2 0.21.2