diff --git a/Gemfile b/Gemfile index 2c923232bf2..0c8cba65c4a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # ruby '1.9.3' -gem 'rails', '~> 3.2' +gem 'rails', '~> 3.2.13' gem 'builder' gem 'bluepill' diff --git a/Gemfile.lock b/Gemfile.lock index f60f6c7fe8d..4608dcd195a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,19 +14,19 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) addressable (2.3.3) aggregate (0.2.2) @@ -112,7 +112,7 @@ GEM high_voltage (1.2.2) highline (1.6.16) hike (1.2.1) - i18n (0.6.4) + i18n (0.6.1) journey (1.0.4) jquery-rails (2.2.1) railties (>= 3.0, < 5.0) @@ -128,13 +128,13 @@ GEM librato-rails (0.8.2) librato-metrics (~> 1.0.2) rails (>= 3.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.21) - multi_json (1.6.1) + multi_json (1.7.0) multipart-post (1.2.0) net-scp (1.1.0) net-ssh (>= 2.6.5) @@ -169,22 +169,22 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + 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.12) + railties (= 3.2.13) rails-erd (1.1.0) activerecord (>= 3.0) activesupport (>= 3.0) choice (~> 0.1.6) ruby-graphviz (~> 1.0.4) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -226,7 +226,7 @@ GEM tilt (~> 1.1, != 1.3.0) state_machine (1.1.2) thor (0.17.0) - tilt (1.3.5) + tilt (1.3.6) timecop (0.6.0) treetop (1.4.12) polyglot @@ -288,7 +288,7 @@ DEPENDENCIES rack rack-maintenance rack-test - rails (~> 3.2) + rails (~> 3.2.13) rails-erd rdoc redis diff --git a/vendor/cache/actionmailer-3.2.12.gem b/vendor/cache/actionmailer-3.2.12.gem deleted file mode 100644 index 748a46d4b21..00000000000 Binary files a/vendor/cache/actionmailer-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-3.2.13.gem b/vendor/cache/actionmailer-3.2.13.gem new file mode 100644 index 00000000000..1433db58699 Binary files /dev/null and b/vendor/cache/actionmailer-3.2.13.gem differ diff --git a/vendor/cache/actionpack-3.2.12.gem b/vendor/cache/actionpack-3.2.12.gem deleted file mode 100644 index 28492a19570..00000000000 Binary files a/vendor/cache/actionpack-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/actionpack-3.2.13.gem b/vendor/cache/actionpack-3.2.13.gem new file mode 100644 index 00000000000..8eb00af06f9 Binary files /dev/null and b/vendor/cache/actionpack-3.2.13.gem differ diff --git a/vendor/cache/activemodel-3.2.12.gem b/vendor/cache/activemodel-3.2.12.gem deleted file mode 100644 index 044d3971fa2..00000000000 Binary files a/vendor/cache/activemodel-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/activemodel-3.2.13.gem b/vendor/cache/activemodel-3.2.13.gem new file mode 100644 index 00000000000..a6bd09db816 Binary files /dev/null and b/vendor/cache/activemodel-3.2.13.gem differ diff --git a/vendor/cache/activerecord-3.2.12.gem b/vendor/cache/activerecord-3.2.12.gem deleted file mode 100644 index b6e7106854d..00000000000 Binary files a/vendor/cache/activerecord-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/activerecord-3.2.13.gem b/vendor/cache/activerecord-3.2.13.gem new file mode 100644 index 00000000000..bdc00435da4 Binary files /dev/null and b/vendor/cache/activerecord-3.2.13.gem differ diff --git a/vendor/cache/activeresource-3.2.12.gem b/vendor/cache/activeresource-3.2.12.gem deleted file mode 100644 index 5ca9efe8dfc..00000000000 Binary files a/vendor/cache/activeresource-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/activeresource-3.2.13.gem b/vendor/cache/activeresource-3.2.13.gem new file mode 100644 index 00000000000..4e3f53b2960 Binary files /dev/null and b/vendor/cache/activeresource-3.2.13.gem differ diff --git a/vendor/cache/activesupport-3.2.12.gem b/vendor/cache/activesupport-3.2.12.gem deleted file mode 100644 index 8a953d3af60..00000000000 Binary files a/vendor/cache/activesupport-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/activesupport-3.2.13.gem b/vendor/cache/activesupport-3.2.13.gem new file mode 100644 index 00000000000..16fe8d1ea4d Binary files /dev/null and b/vendor/cache/activesupport-3.2.13.gem differ diff --git a/vendor/cache/i18n-0.6.1.gem b/vendor/cache/i18n-0.6.1.gem new file mode 100644 index 00000000000..89a7e535585 Binary files /dev/null and b/vendor/cache/i18n-0.6.1.gem differ diff --git a/vendor/cache/i18n-0.6.4.gem b/vendor/cache/i18n-0.6.4.gem deleted file mode 100644 index 6eaf10f0226..00000000000 Binary files a/vendor/cache/i18n-0.6.4.gem and /dev/null differ diff --git a/vendor/cache/mail-2.4.4.gem b/vendor/cache/mail-2.4.4.gem deleted file mode 100644 index acc8533af16..00000000000 Binary files a/vendor/cache/mail-2.4.4.gem and /dev/null differ diff --git a/vendor/cache/mail-2.5.3.gem b/vendor/cache/mail-2.5.3.gem new file mode 100644 index 00000000000..eda4e317d5e Binary files /dev/null and b/vendor/cache/mail-2.5.3.gem differ diff --git a/vendor/cache/multi_json-1.6.1.gem b/vendor/cache/multi_json-1.6.1.gem deleted file mode 100644 index a147212e5b4..00000000000 Binary files a/vendor/cache/multi_json-1.6.1.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.7.0.gem b/vendor/cache/multi_json-1.7.0.gem new file mode 100644 index 00000000000..718172fed7a Binary files /dev/null and b/vendor/cache/multi_json-1.7.0.gem differ diff --git a/vendor/cache/rails-3.2.12.gem b/vendor/cache/rails-3.2.13.gem similarity index 59% rename from vendor/cache/rails-3.2.12.gem rename to vendor/cache/rails-3.2.13.gem index 7151d53ec26..2e15c814401 100644 Binary files a/vendor/cache/rails-3.2.12.gem and b/vendor/cache/rails-3.2.13.gem differ diff --git a/vendor/cache/railties-3.2.12.gem b/vendor/cache/railties-3.2.12.gem deleted file mode 100644 index 4fe87eb3a12..00000000000 Binary files a/vendor/cache/railties-3.2.12.gem and /dev/null differ diff --git a/vendor/cache/railties-3.2.13.gem b/vendor/cache/railties-3.2.13.gem new file mode 100644 index 00000000000..d2ecfd67550 Binary files /dev/null and b/vendor/cache/railties-3.2.13.gem differ diff --git a/vendor/cache/tilt-1.3.5.gem b/vendor/cache/tilt-1.3.5.gem deleted file mode 100644 index 040d13a132e..00000000000 Binary files a/vendor/cache/tilt-1.3.5.gem and /dev/null differ diff --git a/vendor/cache/tilt-1.3.6.gem b/vendor/cache/tilt-1.3.6.gem new file mode 100644 index 00000000000..0fabd6c6b79 Binary files /dev/null and b/vendor/cache/tilt-1.3.6.gem differ