Apply first patchset from jose

Author: josetonyp

.gitignore

@@ -8,4 +8,5 @@ tmp/
 *.sw?
 public/pdf
 index
-coverage 
+coverage
+config/database.yml

.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

.ruby-gemset

@@ -0,0 +1 @@
+dglb

.ruby-version

@@ -0,0 +1 @@
+2.2.0

Gemfile

@@ -1,27 +1,7 @@
 source 'https://rubygems.org'
 
-ruby '2.1.5'
-
-gem 'rails', '3.2.13'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
+gem 'rails', '4.2.4'
 gem 'sqlite3'
-
-
-# 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'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
-
 gem 'jquery-rails'
 gem "ckeditor"
 gem 'turbolinks'
@@ -30,35 +10,29 @@ gem 'nokogiri'
 gem 'devise'
 gem 'devise-i18n-views'
 gem "rspec-rails", :group => [:test, :development]
-gem "paper_trail", "~> 2"
+gem "paper_trail"
 gem "kaminari"
+gem 'bcrypt-ruby'
+gem 'cancancan'
+
+group :assets do
+  gem 'sass-rails', '~> 5.0'
+  gem 'uglifier', '>= 1.3.0'
+end
 
 group :development do
-  gem 'better_errors'
-  gem 'binding_of_caller'
-  gem 'pry'
+  gem 'pry-rails'
+  gem 'awesome_print'
 end
+
 group :test do
   gem 'capybara'
   gem 'factory_girl_rails'
   gem 'guard-rspec'
-  gem 'rb-inotify', '~> 0.8.8'
   gem 'database_cleaner'
 end
-# To use ActiveModel has_secure_password
- gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
 
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
- group :deployment do
+group :deployment do
    gem 'capistrano'
    gem 'rvm-capistrano'
  end
-
-# To use debugger
-# gem 'debugger'