Proceed with gems for Rails4

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 91 insertions, 78 deletions

diff --git a/Gemfile b/Gemfile
index afc91b0..682b248 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,11 @@ def linux_only(require_as)
 end
 
 gem 'rails', '4.0.2'
+gem 'protected_attributes'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
+gem 'activerecord-deprecated_finders'
+gem 'activerecord-session_store'
 
 # DB
 gem 'mysql2', group: :mysql
@@ -53,15 +58,13 @@ gem 'foreman'
 gem 'jquery-rails'
 gem 'gitlab_ci_meta'
 
-group :assets do
-  gem 'sass-rails',   '~> 4.0.0'
-  gem 'coffee-rails', '~> 4.0.0'
+gem 'sass-rails',   '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0.0'
 
-  gem 'uglifier', '>= 1.0.3'
-  gem "therubyracer"
-  gem 'bootstrap-sass', '~> 2.3.2'
-  gem "font-awesome-sass-rails", '~> 3.0.2'
-end
+gem 'uglifier', '>= 1.0.3'
+gem "therubyracer"
+gem 'bootstrap-sass', '~> 2.3.2'
+gem "font-awesome-sass-rails", '~> 3.0.2'
 
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index db1fb87..1606b2f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,45 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.16)
-      actionpack (= 3.2.16)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
       mail (~> 2.5.4)
-    actionpack (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-    activesupport (3.2.16)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-action_caching (1.1.0)
+      actionpack (>= 4.0.0, < 5.0)
+    actionpack-page_caching (1.0.2)
+      actionpack (>= 4.0.0, < 5)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activerecord-session_store (0.1.0)
+      actionpack (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
+      railties (>= 4.0.0, < 5)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     addressable (2.3.5)
     annotate (2.6.0)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
-    arel (3.0.3)
+    arel (4.0.1)
+    atomic (1.1.14)
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
       ice_nine (~> 0.9)
     backports (3.3.5)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    builder (3.0.4)
+    builder (3.1.4)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -54,9 +60,9 @@ GEM
     coercible (0.2.0)
       backports (~> 3.0, >= 3.1.0)
       descendants_tracker (~> 0.0.1)
-    coffee-rails (3.2.2)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -74,7 +80,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.1)
     dotenv (0.9.0)
-    equalizer (0.0.7)
+    equalizer (0.0.8)
     erubis (2.7.0)
     execjs (2.0.2)
     factory_girl (4.3.0)
@@ -112,16 +118,16 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.0.4)
+    guard-rspec (4.2.0)
       guard (>= 2.1.1)
-      rspec (~> 2.14)
+      rspec (>= 2.14, < 4.0)
     haml (4.0.4)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
+    haml-rails (0.5.2)
+      actionpack (~> 4.0.1)
+      activesupport (~> 4.0.1)
+      haml (>= 3.1, < 5.0)
+      railties (~> 4.0.1)
     hashie (2.0.5)
     hike (1.2.3)
     httparty (0.11.0)
@@ -129,7 +135,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.6.9)
     ice_nine (0.10.0)
-    journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -138,7 +143,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     libv8 (3.16.14.3)
-    listen (2.2.0)
+    listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -162,6 +167,8 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
+    protected_attributes (1.0.5)
+      activemodel (>= 4.0.1, < 5.0)
     pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -170,42 +177,34 @@ GEM
       rack (>= 1.1, < 2.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
-    rack (1.4.5)
+    rack (1.5.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-protection (1.5.1)
       rack
-    rack-ssl (1.3.3)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.16)
-      actionmailer (= 3.2.16)
-      actionpack (= 3.2.16)
-      activerecord (= 3.2.16)
-      activeresource (= 3.2.16)
-      activesupport (= 3.2.16)
-      bundler (~> 1.0)
-      railties (= 3.2.16)
-    railties (3.2.16)
-      actionpack (= 3.2.16)
-      activesupport (= 3.2.16)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
     redis (3.0.6)
-    redis-namespace (1.3.2)
+    redis-namespace (1.4.1)
       redis (~> 3.0.4)
     ref (1.0.5)
     rest-client (1.6.7)
@@ -227,10 +226,10 @@ GEM
       rspec-mocks (~> 2.14.0)
     safe_yaml (0.9.7)
     sass (3.2.12)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
+      sprockets-rails (~> 2.0.0)
     settingslogic (2.0.9)
     shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
@@ -253,11 +252,15 @@ GEM
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.4.7)
-    sprockets (2.2.2)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     stamp (0.5.0)
     state_machine (1.2.0)
     temple (0.6.7)
@@ -267,6 +270,8 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
     timers (1.1.0)
     tins (0.13.1)
@@ -285,7 +290,7 @@ GEM
     webmock (1.16.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.0)
+    websocket-driver (0.3.1)
     whenever (0.8.4)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
@@ -296,14 +301,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack-action_caching
+  actionpack-page_caching
+  activerecord-deprecated_finders
+  activerecord-session_store
   annotate
-  bootstrap-sass
+  bootstrap-sass (~> 2.3.2)
   capybara
-  coffee-rails (~> 3.2.1)
+  coffee-rails (~> 4.0.0)
   coveralls
   factory_girl_rails
   ffaker
-  font-awesome-sass-rails
+  font-awesome-sass-rails (~> 3.0.2)
   foreman
   gitlab_ci_meta
   grape
@@ -318,15 +327,16 @@ DEPENDENCIES
   mysql2
   pg
   poltergeist
+  protected_attributes
   pry
   puma (~> 2.3.2)
   quiet_assets
-  rails (= 3.2.16)
+  rails (= 4.0.2)
   rake
   rb-fsevent
   rb-inotify
   rspec-rails
-  sass-rails (~> 3.2.3)
+  sass-rails (~> 4.0.0)
   settingslogic
   shoulda-matchers
   sidekiq