From e67e73adbb27bd14eb995625a9985a4fd32ca26c Mon Sep 17 00:00:00 2001
From: August <august@inniogroup.com>
Date: Thu, 22 May 2014 13:55:38 -0400
Subject: [PATCH] General bundle update in keeping with #930 and the 1.8.x
 deprecation. The only restrictions left are for rails and Rubyzip (not sure
 why). Let's hope Generalissimo Travis approves of this little putsch

---
 Gemfile      | 25 +++++++++++--------------
 Gemfile.lock | 42 +++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0a9cdf2cd..db8e4bf45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,42 +27,42 @@ end
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "~> 3.2.3"
-  gem 'coffee-rails', "~> 3.2.1"
+  gem 'sass-rails'
+  gem 'coffee-rails'
   gem 'therubyracer', :platforms => :ruby
   gem 'execjs'
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier'
 end
 
 gem 'jquery-rails'
 gem 'turbolinks'
-gem 'jquery-timepicker-rails', '~> 1.3'
+gem 'jquery-timepicker-rails'
 gem 'bootstrap-datepicker-rails'
 gem 'twitter-bootstrap-rails-confirm'
 
 #RMagick is used for image resizing and processing
-gem "rmagick", ">= 2.12.2", :require => 'RMagick', :platforms => :ruby
+gem "rmagick", :require => 'RMagick', :platforms => :ruby
 
 # Attachable does all the file work.
-gem 'attachable', '>= 0.0.5'
+gem 'attachable'
 
 gem 'devise', '~> 3.0.0'
 gem 'cancan'
 
-gem 'json', '1.7.7'
+gem 'json'
 gem "rubyzip", '< 1.0.0'
 
 # Process jobs in the background
 gem 'foreman', :group => :development
 gem 'delayed_job_active_record'
-gem 'clockwork', '0.7.0'
+gem 'clockwork'
 
 # Test Coverage
 gem 'simplecov', :require => false, :group => :test
 
 gem 'strong_parameters'
 
-gem 'kaminari', '0.14.1'  # Pagination
+gem 'kaminari'
 
 require "#{Dir.getwd}/lib/command_check.rb"
 if system_has_mysql?
@@ -84,10 +84,7 @@ gem "sqlite3", :group => [:development, :test]
 gem "mysql2", :require => false, :group => :production, :platforms => mysql_platforms
 gem "pg", :require => false, :group => :production, :platforms => postgres_platforms
 
-# Enable the newsfeed for 1.9+ users.
-pa_platforms = [:ruby_19, :ruby_20, :ruby_21] 
-pa_platforms &= Bundler::Dependency::PLATFORM_MAP.keys
-gem 'public_activity', :platforms => pa_platforms
+gem 'public_activity'
 
-gem 'redcarpet', '~> 2.3.0'
+gem 'redcarpet'
 gem 'docsplit', :git => 'https://github.com/augustf/docsplit.git', :branch => 'imagemagick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0366fada4..d0e1b7d9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
-    airbrake (3.1.16)
+    airbrake (3.1.17)
       builder
       multi_json
     arel (3.0.3)
@@ -52,9 +52,9 @@ GEM
       railties (>= 3.0)
     builder (3.0.4)
     cancan (1.6.10)
-    clockwork (0.7.0)
+    clockwork (0.7.5)
       activesupport
-      tzinfo (~> 0.3.35)
+      tzinfo
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -121,9 +121,9 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-timepicker-rails (1.3.7)
       railties (>= 3.1.0)
-    json (1.7.7)
+    json (1.8.1)
     jwt (1.0.0)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.2)
@@ -133,9 +133,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multipart-post (2.0.0)
-    mysql2 (0.3.15)
+    mysql2 (0.3.16)
     orm_adapter (0.5.0)
     pg (0.17.1)
     polyglot (0.3.4)
@@ -166,10 +166,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     ref (1.0.5)
     retriable (1.4.1)
     rmagick (2.13.2)
@@ -216,9 +216,9 @@ GEM
       coffee-rails
     twitter-bootstrap-rails-confirm (1.0.2)
     tzinfo (0.3.39)
-    uglifier (2.2.1)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     uuidtools (2.1.4)
     warden (1.2.3)
       rack (>= 1.0)
@@ -228,11 +228,11 @@ PLATFORMS
 
 DEPENDENCIES
   airbrake
-  attachable (>= 0.0.5)
+  attachable
   bootstrap-datepicker-rails
   cancan
-  clockwork (= 0.7.0)
-  coffee-rails (~> 3.2.1)
+  clockwork
+  coffee-rails
   concerto-hardware
   concerto_calendar
   concerto_iframe
@@ -246,21 +246,21 @@ DEPENDENCIES
   foreman
   girl_friday
   jquery-rails
-  jquery-timepicker-rails (~> 1.3)
-  json (= 1.7.7)
-  kaminari (= 0.14.1)
+  jquery-timepicker-rails
+  json
+  kaminari
   mysql2
   pg
   public_activity
   rails (~> 3.2.17)
-  redcarpet (~> 2.3.0)
-  rmagick (>= 2.12.2)
+  redcarpet
+  rmagick
   rubyzip (< 1.0.0)
-  sass-rails (~> 3.2.3)
+  sass-rails
   simplecov
   sqlite3
   strong_parameters
   therubyracer
   turbolinks
   twitter-bootstrap-rails-confirm
-  uglifier (>= 1.0.3)
+  uglifier