From 2ee8b7d37fe46c8286f0bb9cc79d33dea71abab7 Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <bordjukov@gmail.com>
Date: Sat, 22 Nov 2014 20:10:06 +0200
Subject: [PATCH] Update Rails to 4.1.8

---
 Gemfile                           |  6 +--
 Gemfile.lock                      | 68 +++++++++++++++----------------
 config/environments/production.rb |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Gemfile b/Gemfile
index 569a3e6..3bf9f65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.1.6'
+gem 'rails', '4.1.8'
 
 gem 'sqlite3'
 gem 'pg'
 
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails', '~> 5.0.0.beta1'
 
 gem 'uglifier'
 gem 'coffee-rails'
@@ -35,7 +35,7 @@ gem 'capistrano-rvm'
 
 gem 'puma'
 
-gem 'globalize', '~> 4.0.2'
+gem 'globalize'
 
 gem 'yaml_db', github: 'jetthoughts/yaml_db', ref: 'fb4b6bd7e12de3cffa93e0a298a1e5253d7e92ba'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 22895af..a269c29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,27 +17,27 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -180,15 +180,15 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     rails-erd (1.1.0)
       activerecord (>= 3.0)
@@ -198,9 +198,9 @@ GEM
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -233,12 +233,12 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     ruby-graphviz (1.0.9)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+    sass (3.4.8)
+    sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.2)
+      sprockets (~> 2.12)
+      sprockets-rails (>= 2.0, < 4.0)
     simple_form (3.1.0.rc2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
@@ -254,7 +254,7 @@ GEM
     spring (1.2.0)
     spring-commands-rspec (1.0.2)
       spring (>= 0.9.1)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -307,7 +307,7 @@ DEPENDENCIES
   factory_girl_rails
   faker
   font-awesome-rails
-  globalize (~> 4.0.2)
+  globalize
   guard-rspec
   hirb
   jquery-datatables-rails
@@ -318,13 +318,13 @@ DEPENDENCIES
   phony_rails
   pry-rails
   puma
-  rails (= 4.1.6)
+  rails (= 4.1.8)
   rails-erd
   rails-i18n
   raphael-rails
   rmagick
   rspec-rails
-  sass-rails (~> 4.0.3)
+  sass-rails (~> 5.0.0.beta1)
   simple_form (~> 3.1.0.rc2)
   simple_form_fancy_uploads!
   slim-rails
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e51af2c..579a0e5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -32,7 +32,7 @@ Rails.application.configure do
   # Generate digests for assets URLs.
   config.assets.digest = true
 
-  # `config.assets.precompile` has moved to config/initializers/assets.rb
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache