Merge pull request #541 from DefactoSoftware/jurre/update-rails

Update to Rails 5

.rubocop.yml

@@ -0,0 +1,8 @@
+Style/StringLiterals:
+  Description: Checks if uses of quotes match the configured preference.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
+  Enabled: true
+  EnforcedStyle: double_quotes
+  SupportedStyles:
+  - single_quotes
+  - double_quotes

Gemfile

@@ -3,54 +3,54 @@ source "https://rubygems.org"
 ruby "2.4.2"
 
 gem "airbrake"
+gem "apartment"
+gem "audited"
+gem "aws-sdk"
+gem "bitters"
 gem "bourbon"
+gem "brakeman"
 gem "coffee-rails"
-gem "delayed_job_active_record", "4.0.3"
+gem "delayed_job_active_record"
+gem "devise", "~> 4.7.1"
+gem "devise_invitable"
 gem "email_validator"
 gem "flutie"
+gem "gravatar_image_tag"
+gem "haml-rails"
+gem "hashtel", "~> 0.0.2"
 gem "high_voltage"
+gem "holidays"
+gem "http_accept_language"
+gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
 gem "jquery-rails", "~> 4.0"
+gem "kaminari"
+gem "momentjs-rails"
 gem "neat"
-gem "bitters"
+gem "normalize-rails"
+gem "paperclip", "~> 6.1.0"
 gem "pg"
+gem "pikaday-gem", "~> 1.2.0.0"
 gem "rack-timeout"
-gem "rails", "~> 4.2.11"
+gem "rails", "~> 5.0.0"
 gem "recipient_interceptor"
+gem "redcarpet"
 gem "sass-rails", "~> 5.0.1"
+gem "select2-rails"
 gem "simple_form"
+gem "sprockets-rails", "~>3.0"
 gem "title"
+gem "twitter-text" # hashtag parsing
 gem "uglifier"
 gem "unicorn"
-gem "devise", "~> 4.7.1"
-gem "devise_invitable"
-gem "apartment", "~> 0.26.0"
-gem "pikaday-gem", "~> 1.2.0.0"
-gem "momentjs-rails"
-gem "gravatar_image_tag"
-gem "hashtel", "~> 0.0.2"
-gem "kaminari"
-gem "select2-rails"
-gem "http_accept_language"
-gem "normalize-rails"
-gem "twitter-text" # hashtag parsing
-gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
-gem "haml-rails"
-gem "audited-activerecord", "~> 4.0"
-gem "paperclip", "~> 6.1.0"
-gem "aws-sdk"
-gem "redcarpet"
-gem "holidays"
-gem "sprockets-rails", "~>3.0"
-gem "brakeman"
 
 source "https://rails-assets.org" do
   gem "rails-assets-chartjs"
 end
 
 # caching
 
-gem "kgio" # faster I/O
 gem "dalli" # memcached
+gem "kgio" # faster I/O
 gem "memcachier"
 
 group :development do
@@ -63,17 +63,17 @@ group :development do
 end
 
 group :development, :test do
+  gem "annotate"
   gem "dotenv-rails"
+  gem "email_spec"
   gem "factory_girl_rails"
+  gem "letter_opener"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.8"
-  gem "annotate"
-  gem "letter_opener"
-  gem "email_spec"
 end
 
 group :test do
-  gem 'capybara'
+  gem "capybara"
   gem "database_cleaner"
   gem "launchy"
   gem "shoulda-matchers", "~> 2.7.0"