From 7a6cfb2df114d8c4da1294e45caa669fa338671b Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Tue, 25 Mar 2014 12:53:20 +0000
Subject: [PATCH] Bump gem versions to latest stable without breaking
 compatibility Fixes .env in staging/production

---
 Gemfile      | 14 +++++++-------
 Gemfile.lock | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02c5619..02faf4f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,24 +2,25 @@ source 'http://rubygems.org'
 
 ruby '2.1.1'
 
+gem 'dotenv-rails', '~> 0.10.0'
 gem 'rails', '~> 3.2.17'
 gem 'mysql2', '~> 0.3.15'
 
 # Libraries
 gem 'jquery-rails', '~> 2.0.2'
-gem 'sass-rails'
-gem 'coffee-rails'
-gem 'gruff'
-gem 'nokogiri'
-gem 'rbbcode'
+gem 'sass-rails', '~> 3.2.5'
+gem 'coffee-rails', '~> 3.2.2'
+gem 'gruff', '~> 0.3.6'
+gem 'nokogiri', '~> 1.6.1'
+gem 'rbbcode', '~> 0.1.11'
 gem 'tinymce-rails', '~> 3.5.4.1'
 gem 'carrierwave', '~> 0.10.0'
 gem 'bluecloth', '~> 2.2.0'
 gem 'bb-ruby', '~> 1.0.4'
 gem 'therubyracer', '~> 0.12.1'
+gem 'newrelic_rpm', '~> 3.7.2.195'
 gem 'rmagick', '~> 2.13.2', require: false
 gem 'will_paginate', git: 'https://github.com/p7r/will_paginate.git', branch: 'rails3'
-gem 'newrelic_rpm', '~> 3.7.2.195'
 
 group :assets do
   gem 'uglifier', '~> 2.5.0'
@@ -45,7 +46,6 @@ end
 
 group :development, :test do
   gem 'pry-debugger', '~> 0.2.2'
-  gem 'dotenv-rails', '~> 0.10.0'
 end
 
 group :staging, :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 43083c1..0b08208 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,14 +114,17 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mini_portile (0.5.3)
     multi_json (1.8.4)
     mysql2 (0.3.15)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
     newrelic_rpm (3.7.2.195)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-x86-mingw32)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-x86-mingw32)
+      mini_portile (~> 0.5.0)
     poltergeist (1.5.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -251,24 +254,24 @@ DEPENDENCIES
   capistrano3-unicorn (~> 0.1.1)
   capybara (~> 2.2.1)
   carrierwave (~> 0.10.0)
-  coffee-rails
+  coffee-rails (~> 3.2.2)
   dalli (~> 2.7.0)
   dotenv-rails (~> 0.10.0)
   factory_girl_rails (~> 4.4.1)
-  gruff
+  gruff (~> 0.3.6)
   jquery-rails (~> 2.0.2)
   kgio (~> 2.9.2)
   mysql2 (~> 0.3.15)
   newrelic_rpm (~> 3.7.2.195)
-  nokogiri
+  nokogiri (~> 1.6.1)
   poltergeist (~> 1.5.0)
   pry-debugger (~> 0.2.2)
   rails (~> 3.2.17)
-  rbbcode
+  rbbcode (~> 0.1.11)
   rmagick (~> 2.13.2)
   rspec-given (~> 3.5.4)
   rspec-rails (~> 2.14.1)
-  sass-rails
+  sass-rails (~> 3.2.5)
   simplecov (~> 0.7.1)
   therubyracer (~> 0.12.1)
   tinymce-rails (~> 3.5.4.1)