diff --git a/Gemfile b/Gemfile index c712498..4489001 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "3.2.10" +gem "rails", "3.2.11" # Bundle edge Rails instead: # gem "rails", :git => "git://github.com/rails/rails.git" @@ -14,7 +14,8 @@ gem "bcrypt-ruby", "3.0.0" gem "dynamic_form" -gem "exception_notification" +# use old version that doesn't have tinder bullshit +gem "exception_notification", "2.6.1" # Use unicorn as the app server gem "unicorn" diff --git a/Gemfile.lock b/Gemfile.lock index 9f3b3e6..5ed8ca9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.10) - actionpack (= 3.2.10) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,18 +14,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.10) - activesupport (= 3.2.10) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.10) - activemodel (= 3.2.10) - activesupport (= 3.2.10) - activesupport (3.2.10) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -42,9 +42,9 @@ GEM htmlentities (4.3.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) json (1.7.6) kgio (2.7.4) machinist (2.0) @@ -55,26 +55,26 @@ GEM mime-types (1.19) multi_json (1.5.0) mysql2 (0.3.11) - nokogiri (1.5.5) + nokogiri (1.5.6) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.10) - actionmailer (= 3.2.10) - actionpack (= 3.2.10) - activerecord (= 3.2.10) - activeresource (= 3.2.10) - activesupport (= 3.2.10) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.10) - railties (3.2.10) - actionpack (= 3.2.10) - activesupport (= 3.2.10) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -84,20 +84,18 @@ GEM rdiscount (1.6.8) rdoc (3.12) json (~> 1.4) - riddle (1.5.2) - rspec (2.11.0) - rspec-core (~> 2.11.0) - rspec-expectations (~> 2.11.0) - rspec-mocks (~> 2.11.0) - rspec-core (2.11.0) - rspec-expectations (2.11.1) + riddle (1.5.4) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.11.1) - rspec-rails (2.11.0) + rspec-mocks (2.12.1) + rspec-rails (2.12.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.11.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -114,10 +112,10 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.35) - uglifier (1.2.6) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) - unicorn (4.3.1) + multi_json (~> 1.0, >= 1.0.2) + unicorn (4.5.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -128,13 +126,13 @@ PLATFORMS DEPENDENCIES bcrypt-ruby (= 3.0.0) dynamic_form - exception_notification + exception_notification (= 2.6.1) htmlentities jquery-rails machinist mysql2 nokogiri - rails (= 3.2.10) + rails (= 3.2.11) rdiscount rspec-rails (~> 2.6) sqlite3 diff --git a/config/application.rb b/config/application.rb index e2909d2..bb3f863 100644 --- a/config/application.rb +++ b/config/application.rb @@ -60,6 +60,10 @@ module Lobsters end end +silence_warnings do + ActionDispatch::ParamsParser::DEFAULT_PARSERS = {} +end + Rails.application.routes.default_url_options[:host] = "lobste.rs" require "#{Rails.root}/lib/monkey"