From b3e6679da027d2ba52fe3e30aea5d6445a2d4a57 Mon Sep 17 00:00:00 2001
From: joshua stein <jcs@jcs.org>
Date: Fri, 1 Aug 2014 15:07:20 -0500
Subject: [PATCH] update some gems, remove some useless comments from Gemfile

---
 Gemfile      | 50 +++++++++++++++++----------------------
 Gemfile.lock | 67 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6f41a63..ba3c61d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,41 +1,35 @@
 source "https://rubygems.org"
 
-# Bundle edge Rails instead: gem "rails", github: "rails/rails"
 gem "rails", "4.0.5"
 
-# Use mysql2 as the database for Active Record
-gem "mysql2", ">= 0.3.14"
-
-# Use PostgreSQL as the database for Active Record
-# gem "pg"
-#
-# NOTE: If you use PostgreSQL, you must still leave enabled the above mysql2 gem
-#       for Sphinx full text search to function.
-
-# Use Uglifier as compressor for JavaScript assets
-gem "uglifier", ">= 1.3.0"
-
-# Use jquery as the JavaScript library
-gem "jquery-rails"
-gem "dynamic_form"
-
-# use old version that doesn't have tinder bullshit
-gem "exception_notification", "2.6.1"
-
-# Use ActiveModel has_secure_password
-gem "bcrypt-ruby", "~> 3.1.2"
-
-# Use unicorn as the app server
 gem "unicorn"
 
-gem "nokogiri"
-gem "htmlentities"
-gem "rdiscount"
+gem "mysql2", ">= 0.3.14"
 
-gem "oauth"
+# uncomment to use PostgreSQL
+# gem "pg"
+#
+# NOTE: If you use PostgreSQL, you must still leave enabled the above mysql2
+# gem for Sphinx full text search to function.
 
 gem "thinking-sphinx", "~> 3.0.6"
 
+gem "uglifier", ">= 1.3.0"
+gem "jquery-rails"
+gem "dynamic_form"
+
+gem "exception_notification"
+
+gem "bcrypt-ruby", "~> 3.1.2"
+
+gem "nokogiri", "= 1.6.1"
+gem "htmlentities"
+gem "rdiscount"
+
+# for twitter-posting bot
+gem "oauth"
+
+# for parsing incoming mail
 gem "mail"
 
 group :test, :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2925601..372bafd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,39 +26,42 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.1.4)
     diff-lcs (1.2.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    exception_notification (2.6.1)
+    exception_notification (4.0.1)
       actionmailer (>= 3.0.4)
-    execjs (2.0.2)
-    faker (1.4.1)
+      activesupport (>= 3.0.4)
+    execjs (2.2.1)
+    faker (1.4.2)
       i18n (~> 0.5)
     hike (1.2.3)
-    htmlentities (4.3.1)
-    i18n (0.6.9)
+    htmlentities (4.3.2)
+    i18n (0.6.11)
     innertube (1.1.0)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    kgio (2.8.1)
+    kgio (2.9.2)
     machinist (2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     middleware (0.1.0)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.10.0)
-    mysql2 (0.3.14)
+    multi_json (1.10.1)
+    mysql2 (0.3.16)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -75,21 +78,25 @@ GEM
       activesupport (= 4.0.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.12.0)
-    rake (10.3.1)
-    rdiscount (2.1.7)
-    riddle (1.5.9)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    rdiscount (2.1.7.1)
+    riddle (1.5.11)
+    rspec-collection_matchers (1.0.0)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.1)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.99.2)
+    rspec-rails (2.99.0)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -99,7 +106,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     thinking-sphinx (3.0.6)
       activerecord (>= 3.1.0)
       builder (>= 2.1.2)
@@ -107,16 +114,16 @@ GEM
       middleware (>= 0.1.0)
       riddle (>= 1.5.9)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    uglifier (2.4.0)
+    tzinfo (0.3.40)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.7.0)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -127,14 +134,14 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby (~> 3.1.2)
   dynamic_form
-  exception_notification (= 2.6.1)
+  exception_notification
   faker
   htmlentities
   jquery-rails
   machinist
   mail
   mysql2 (>= 0.3.14)
-  nokogiri
+  nokogiri (= 1.6.1)
   oauth
   rails (= 4.0.5)
   rdiscount