Merge pull request #206 from chapmanu/fix-gemfile-deadlock

Fix Gem File Deadlock; Update Rave Feed

.gitignore

@@ -4,6 +4,8 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
+config/secrets.yml
+
 # Ignore bundler config.
 /.bundle
 

Gemfile

@@ -1,26 +1,27 @@
 source 'https://rubygems.org'
+ruby '2.2.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.7.1'
+gem 'rails', '~> 4.2.8'
 # Use postgresql as the database for Active Record
-gem 'pg', '0.18.2'
+gem 'pg', '~> 0.18.4'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0.6'
+gem 'sass-rails', '~> 5.0.7'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 4.1.16'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.1.1'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks', '2.5.3'
+gem 'turbolinks', '~> 2.5.4'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+gem 'jbuilder', '~> 2.7.0'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
+gem 'sdoc', '~> 0.4.2', group: :doc
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -31,30 +32,30 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 # Other gems...
 # TODO: add comment for each gem (or group of related gems) explaining why it was included.
 gem "airbrussh", :require => false
-gem 'has_many_prevent_dups', '0.0.3'
-gem 'public_activity', '1.4.2'
-gem 'rails4-autocomplete', '1.1.1'
+gem 'has_many_prevent_dups', '~> 0.0.3'
+gem 'public_activity', '~> 1.4.3'
+gem 'rails4-autocomplete', '~> 1.1.1'
 gem 'mini_magick'
-gem 'inline_svg', '1.3.1'
-gem 'screencap', '0.1.4'
-gem 'materialize-sass', '0.98.2'
-gem 'selectize-rails', '0.12.1'
-gem 'cancancan', '1.12.0'
-gem 'net-ldap', '0.16.0'
-gem 'devise', '3.5.2'
-gem 'bugsnag', '2.8.12'
-gem 'whenever', '0.9.4', :require => false
-gem 'jquery-ui-rails', '5.0.5'
-gem 'kaminari', '0.16.3'
-gem 'remotipart', '~> 1.2'
-gem 'carrierwave', '0.10.0'
+gem 'inline_svg', '~> 1.3.1'
+gem 'screencap', '~> 0.1.4'
+gem 'materialize-sass', '~> 0.98.2'
+gem 'selectize-rails', '~> 0.12.5'
+gem 'cancancan', '~> 1.12.0'
+gem 'net-ldap', '~> 0.16.1'
+gem 'devise', '~> 3.5.10'
+gem 'bugsnag', '~> 2.8.13'
+gem 'whenever', '~> 0.9.7', :require => false
+gem 'jquery-ui-rails', '~> 5.0.5'
+gem 'kaminari', '~> 0.16.3'
+gem 'remotipart', '~> 1.4.2'
+gem 'carrierwave', '~> 0.10.0'
 gem 'friendly_id', '~> 5.1.0'
 gem 'trix'
-gem 'bourbon'
-gem 'neat'
-gem 'bitters'
+gem 'bourbon', '< 5.0.0'
+gem 'neat', '~> 1.8'
+gem 'bitters', '< 1.0.0'
 gem 'refills'
-gem 'rest-client', '1.8.0'
+gem 'rest-client', '~> 1.8.0'
 gem 'awesome_print'
 
 # Allow user to easily switch users in dev
@@ -65,10 +66,10 @@ gem "switch_user", group: :development
 gem "letter_opener_web", group: :development
 
 # Use Capistrano for deployment
-gem 'capistrano',          '~> 3.1',   group: :development
-gem 'capistrano-rails',    '~> 1.1',   group: :development
-gem 'capistrano-rvm',      '0.1.2',    group: :development
-gem 'capistrano-passenger', '0.1.1',    group: :development
+gem 'capistrano', '~> 3.11.0',   group: :development
+gem 'capistrano-rails', '~> 1.4.0',   group: :development
+gem 'capistrano-rvm', '~> 0.1.2',    group: :development
+gem 'capistrano-passenger', '~> 0.1.1',    group: :development
 
 group :development, :test do
   gem 'dotenv-rails'
@@ -80,7 +81,7 @@ group :development, :test do
   gem 'byebug'
 
   # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
+  gem 'web-console', '~> 2.3.0'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'