- Upgrade to use ruby 2.2. version

- Fixed active_admin config

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.0

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.1.5'
+ruby '2.2.0'
 
 gem 'rails', '4.1.8'
 gem 'arel'

Gemfile.lock

@@ -1,29 +1,31 @@
 GIT
   remote: git://github.com/gregbell/active_admin.git
-  revision: 7a2a31067e99e8e484942a3cddc44be1980b1ae6
+  revision: 633c1a4f1f7f15759de77691376bea783405118b
   specs:
     activeadmin (1.0.0.pre)
-      arbre (~> 1.0)
+      arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
-      formtastic (~> 2.3.0.rc3)
-      inherited_resources (~> 1.4.1)
+      formtastic (~> 3.1)
+      formtastic_i18n
+      inherited_resources (~> 1.4, != 1.5.0)
       jquery-rails
       jquery-ui-rails (~> 5.0)
       kaminari (~> 0.15)
       rails (>= 3.2, < 4.2)
-      ransack (~> 1.0)
+      ransack (~> 1.3)
       sass-rails
 
 GIT
   remote: git://github.com/rails/sass-rails.git
-  revision: 57ec3397ff99655890895df29a7bf3f683410256
+  revision: af012d9e7e5283b068cd99a3b549587303762898
   specs:
-    sass-rails (5.0.0.dev)
+    sass-rails (5.0.0)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2)
-      sprockets (~> 2.12)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -55,16 +57,16 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     ansi (1.4.3)
-    arbre (1.0.1)
+    arbre (1.0.2)
       activesupport (>= 3.0.0)
     arel (5.0.1.20140414130214)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     bourbon (4.0.2)
       sass (~> 3.3)
       thor
-    browser (0.7.0)
+    browser (0.8.0)
     builder (3.2.2)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -78,10 +80,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    delayed_job (4.0.2)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
-      activerecord (>= 3.0, < 4.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     delayed_job_web (1.2.9)
       activerecord (> 3.0.0)
@@ -96,39 +98,49 @@ GEM
     devise-async (0.9.0)
       devise (~> 3.2)
     docile (1.1.5)
-    email_validator (1.4.0)
+    email_validator (1.5.0)
       activemodel
     erubis (2.7.0)
-    execjs (2.2.1)
-    formtastic (2.3.0.rc3)
-      actionpack (>= 3.0)
-    haml (4.0.6)
+    execjs (2.2.2)
+    formtastic (3.1.2)
+      actionpack (>= 3.2.13)
+    formtastic_i18n (0.1.1)
+    haml (4.1.0.beta.1)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.6.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    handy (0.0.27)
+    handy (0.0.28)
       hashr
     has_scope (0.6.0.rc)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     hashr (0.0.22)
     hike (1.2.3)
-    honeybadger (1.16.3)
+    honeybadger (1.16.7)
       json
-    i18n (0.6.11)
-    inherited_resources (1.4.1)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
+    i18n (0.7.0)
+    inherited_resources (1.5.1)
+      actionpack (>= 3.2, < 4.2)
       has_scope (~> 0.6.0.rc)
-      responders (~> 1.0.0.rc)
+      railties (>= 3.2, < 4.2)
+      responders (~> 1.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.0)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.1)
     kaminari (0.16.1)
@@ -138,18 +150,18 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    minitest (5.4.3)
-    minitest-reporters (1.0.5)
+    minitest (5.5.0)
+    minitest-reporters (1.0.8)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.10.1)
     orm_adapter (0.5.0)
     pg (0.17.1)
-    polyamorous (1.0.0)
+    polyamorous (1.1.0)
       activerecord (>= 3.0)
-    quiet_assets (1.0.3)
+    quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-protection (1.5.3)
@@ -166,47 +178,50 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    rails_12factor (0.0.2)
+    rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.2)
+    rails_serve_static_assets (0.0.3)
     rails_stdout_logging (0.0.3)
     railties (4.1.8)
       actionpack (= 4.1.8)
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.2)
-    ransack (1.2.3)
+    rake (10.4.2)
+    ransack (1.5.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
-      polyamorous (~> 1.0.0)
-    responders (1.0.0)
-      railties (>= 3.2, < 5)
-    ruby-progressbar (1.5.1)
-    sass (3.3.14)
-    simple_form (3.0.2)
+      polyamorous (~> 1.1)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
+    ruby-progressbar (1.7.1)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
+    sass (3.4.9)
+    sexp_processor (4.4.4)
+    simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.9.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    spring (1.1.3)
+    spring (1.2.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -220,10 +235,10 @@ GEM
       railties (~> 4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.8.2)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)

circle.yml

@@ -7,7 +7,7 @@ machine:
   # Version of ruby to use
   ruby:
     version:
-      2.1.5
+      2.2.0
 
   # Add some environment variables
   environment:

config/initializers/active_admin.rb

@@ -121,7 +121,7 @@
   # This allows your users to comment on any resource registered with Active Admin.
   #
   # You can completely disable comments:
-  config.allow_comments = false
+  config.comments = false
   #
   # You can disable the menu item for the comments index page:
   # config.show_comments_in_menu = false