diff --git a/src/Gemfile b/src/Gemfile index a53088faeea..0a2f60a7134 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -1,6 +1,6 @@ source 'http://repos.fedorapeople.org/repos/katello/gems/' -gem 'rails', '3.0.9' +gem 'rails', '3.0.10' gem 'thin', '>=1.2.11' gem 'json' diff --git a/src/Gemfile.lock b/src/Gemfile.lock index d56f8664ed8..176830d305b 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -1,34 +1,35 @@ GEM + remote: http://repos.fedorapeople.org/repos/katello/gems/ specs: ZenTest (4.5.0) abstract (1.0.0) - actionmailer (3.0.9) - actionpack (= 3.0.9) - mail (~> 2.2.19) - actionpack (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) + actionmailer (3.0.10) + actionpack (= 3.0.10) + mail (~> 2.3.0) + actionpack (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) + rack (>= 1.2.1) + rack-mount (>= 0.6.14) + rack-test (>= 0.5.4) tzinfo (~> 0.3.23) - activemodel (3.0.9) - activesupport (= 3.0.9) + activemodel (3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - arel (~> 2.0.10) + activerecord (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + arel (~> 2.0.9) tzinfo (~> 0.3.23) - activeresource (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - activesupport (3.0.9) - arel (2.0.10) + activeresource (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + activesupport (3.0.10) + arel (2.0.9) autotest-rails (4.1.0) ZenTest builder (2.1.2) @@ -79,8 +80,7 @@ GEM json (1.4.6) linecache (0.43) locale (2.0.5) - mail (2.2.19) - activesupport (>= 2.3.6) + mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -98,30 +98,32 @@ GEM oauth (0.4.4) pg (0.10.1) polyglot (0.3.1) - rack (1.2.3) - rack-mount (0.6.14) + rack (1.3.0) + rack-mount (0.7.1) rack (>= 1.0.0) - rack-test (0.5.7) + regin (>= 0.3.7) + rack-test (0.6.0) rack (>= 1.0) - rails (3.0.9) - actionmailer (= 3.0.9) - actionpack (= 3.0.9) - activerecord (= 3.0.9) - activeresource (= 3.0.9) - activesupport (= 3.0.9) + 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.9) + railties (= 3.0.10) rails_warden (0.5.2) warden - railties (3.0.9) - actionpack (= 3.0.9) - activesupport (= 3.0.9) + 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.9.2) rcov (0.9.9) - rdoc (3.9.4) + rdoc (3.8) + regin (0.3.8) rest-client (1.6.1) mime-types (>= 1.16) rspec (2.5.0) @@ -193,7 +195,7 @@ DEPENDENCIES nokogiri (>= 1.5.0) oauth pg - rails (= 3.0.9) + rails (= 3.0.10) rails_warden rcov (>= 0.9.9) rest-client