diff --git a/Gemfile b/Gemfile
index 29cf248c2..eb919eb4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.1.11'
+gem 'rails'
 
 gem 'activeadmin',                      github: 'activeadmin'
 gem 'pg'
diff --git a/Gemfile.lock b/Gemfile.lock
index d387fa7d4..02c1955e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,7 +10,7 @@ GIT
 
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: 9c46b14ea0d9b3aaaa3d7520555c9959d06ce7f3
+  revision: 0ffc65a28847f46af1b707d43562eef1051b7960
   specs:
     activeadmin (1.0.0.pre1)
       arbre (~> 1.0, >= 1.0.2)
@@ -47,51 +47,60 @@ GEM
   remote: https://rails-assets.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.1.11)
-      actionpack (= 4.1.11)
-      actionview (= 4.1.11)
+    actionmailer (4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.11)
-      actionview (= 4.1.11)
-      activesupport (= 4.1.11)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.2)
+      actionview (= 4.2.2)
+      activesupport (= 4.2.2)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.11)
-      activesupport (= 4.1.11)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.11)
-      activesupport (= 4.1.11)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.2)
+      activesupport (= 4.2.2)
+      globalid (>= 0.3.0)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.1.11)
-      activemodel (= 4.1.11)
-      activesupport (= 4.1.11)
-      arel (~> 5.0.0)
-    activesupport (4.1.11)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
+      arel (~> 6.0)
+    activesupport (4.2.2)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
-    airbrake (4.1.0)
+    addressable (2.3.8)
+    airbrake (4.2.1)
       builder
       multi_json
     ancestry (2.1.0)
       activerecord (>= 3.0.0)
     angular-i18n (0.1.2)
-    angular-rails-templates (0.1.3)
+    angular-rails-templates (0.2.0)
       railties (>= 3.1)
-      sprockets
+      sprockets (~> 2)
       tilt
-    angular-ui-bootstrap-rails (0.12.0)
-    angularjs-rails (1.3.14)
+    angular-ui-bootstrap-rails (0.13.0)
+    angularjs-rails (1.4.0)
     arbre (1.0.3)
       activesupport (>= 3.0.0)
-    arel (5.0.1.20140414130214)
-    attr_encrypted (1.3.3)
+    arel (6.0.0)
+    attr_encrypted (1.3.4)
       encryptor (>= 1.3.0)
-    autoprefixer-rails (5.1.7)
+    autoprefixer-rails (5.2.0)
       execjs
       json
     bcrypt (3.1.10)
@@ -101,7 +110,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.3)
+    bootstrap-sass (3.3.4.1)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.2.19)
     bourbon (4.2.3)
@@ -153,9 +162,9 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     creole (0.5.0)
-    daemons (1.1.9)
+    daemons (1.2.2)
     debug_inspector (0.0.2)
-    devise (3.4.1)
+    devise (3.5.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -179,7 +188,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.6)
+    ffi (1.9.8)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     formtastic (3.1.3)
@@ -201,7 +210,9 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3)
-    gli (2.13.0)
+    gli (2.13.1)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     gollum-lib (3.0.0)
       github-markup (~> 1.1.0)
       gitlab-grit (~> 2.6.5)
@@ -211,16 +222,16 @@ GEM
       stringex (~> 2.5.1)
     haml (4.0.6)
       tilt
-    haml-rails (0.8.2)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     has_scope (0.6.0)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
-    hashie (3.4.0)
+    hashie (3.4.2)
     highline (1.6.21)
     hike (1.2.3)
     hirb (0.7.3)
@@ -229,6 +240,7 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
+    htmlentities (4.3.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -237,7 +249,7 @@ GEM
       has_scope (~> 0.6.0.rc)
       railties (>= 3.2, < 5)
       responders
-    jbuilder (2.2.9)
+    jbuilder (2.2.16)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-migrate-rails (1.2.1)
@@ -246,22 +258,24 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    js-routes (1.0.0)
+    js-routes (1.0.1)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
-    jwt (1.3.0)
+    jwt (1.5.0)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     libv8 (3.16.14.7)
-    localeapp (0.9.0)
+    localeapp (0.9.3)
       gli
       i18n
       json
       rack
       rest-client
       ya2yaml
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mailcatcher (0.6.1)
@@ -281,8 +295,8 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.6.2)
     minitest (5.7.0)
-    mock_redis (0.14.0)
-    momentjs-rails (2.9.0)
+    mock_redis (0.14.1)
+    momentjs-rails (2.10.2)
       railties (>= 3.1)
     mono_logger (1.1.0)
     multi_json (1.11.1)
@@ -298,7 +312,7 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     netrc (0.10.3)
-    newrelic_rpm (3.10.0.279)
+    newrelic_rpm (3.12.0.288)
     ng-rails-csrf (0.1.0)
     ngmin-rails (0.4.0)
       rails (>= 3.1)
@@ -327,9 +341,7 @@ GEM
     omniauth-google-oauth2 (0.2.6)
       omniauth (> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
+    omniauth-oauth2 (1.3.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
@@ -338,18 +350,18 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    pg (0.18.1)
+    pg (0.18.2)
     polyamorous (1.2.0)
       activerecord (>= 3.0)
-    posix-spawn (0.3.10)
-    puma (2.11.1)
+    posix-spawn (0.3.11)
+    puma (2.11.3)
       rack (>= 1.1, < 2.0)
-    pundit (0.3.0)
+    pundit (1.0.1)
       activesupport (>= 3.0.0)
-    pygments.rb (0.6.2)
+    pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rack (1.5.4)
+    rack (1.6.2)
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
     rack-mini-profiler (0.9.3)
@@ -362,24 +374,33 @@ GEM
       rack (>= 1.0.0)
     rack-utf8_sanitizer (1.3.0)
       rack (~> 1.0)
-    rails (4.1.11)
-      actionmailer (= 4.1.11)
-      actionpack (= 4.1.11)
-      actionview (= 4.1.11)
-      activemodel (= 4.1.11)
-      activerecord (= 4.1.11)
-      activesupport (= 4.1.11)
+    rails (4.2.2)
+      actionmailer (= 4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
+      activemodel (= 4.2.2)
+      activerecord (= 4.2.2)
+      activesupport (= 4.2.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.11)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.2)
+      sprockets-rails
     rails-assets-notifyjs (0.3.2)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails3-generators (1.0.0)
       railties (>= 3.0.0)
     rails3-jquery-autocomplete (1.0.15)
       rails (>= 3.2)
-    railties (4.1.11)
-      actionpack (= 4.1.11)
-      activesupport (= 4.1.11)
+    railties (4.2.2)
+      actionpack (= 4.2.2)
+      activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -389,7 +410,7 @@ GEM
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
@@ -402,7 +423,7 @@ GEM
     redis-activesupport (4.0.0)
       activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-namespace (1.5.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     redis-rack (1.5.0)
       rack (~> 1.5)
@@ -414,8 +435,8 @@ GEM
     redis-store (1.1.4)
       redis (>= 2.2)
     ref (1.0.5)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -427,7 +448,7 @@ GEM
       redis (~> 3.0.4)
       resque (~> 1.25.1)
       rufus-scheduler (~> 2.0.24)
-    resque-status (0.4.3)
+    resque-status (0.5.0)
       resque (~> 1.19)
     resque_mailer (2.2.7)
       actionmailer (>= 3.0)
@@ -437,15 +458,15 @@ GEM
       netrc (~> 0.7)
     rouge (1.3.4)
     rr (1.1.2)
-    rspec-core (3.2.1)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+    rspec-rails (3.2.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -457,7 +478,7 @@ GEM
     ruby-haml-js (0.0.5)
       execjs
       sprockets (>= 2.0.0)
-    ruby_parser (3.6.4)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
@@ -480,7 +501,7 @@ GEM
       activerecord (>= 3.2, < 4.3)
       valuable
     scrivener (0.0.3)
-    sexp_processor (4.4.5)
+    sexp_processor (4.6.0)
     shotgun (0.9.1)
       rack (>= 1.0)
     shoulda (3.5.0)
@@ -492,10 +513,10 @@ GEM
     simple_form (3.1.0.rc2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     sitemap_generator (5.0.5)
       builder
     skinny (0.2.3)
@@ -503,7 +524,7 @@ GEM
       thin (~> 1.5.0)
     skype (0.2.8)
       tmp_cache
-    slim (3.0.2)
+    slim (3.0.4)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     soundmanager-rails (1.0.1)
@@ -528,7 +549,7 @@ GEM
     temple (0.7.5)
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thin (1.5.1)
@@ -541,9 +562,9 @@ GEM
     time_diff (0.3.0)
       activesupport
       i18n
-    timecop (0.7.3)
+    timecop (0.7.4)
     tmp_cache (0.1.1)
-    twitter-text (1.11.0)
+    twitter-text (1.12.0)
       unf (~> 0.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -553,20 +574,22 @@ GEM
     underscore-rails (1.8.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.1)
     valuable (0.9.9)
     vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.20.4)
+    webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     whenever (0.9.4)
       chronic (>= 0.6.3)
-    wikicloth (0.8.2)
+    wikicloth (0.8.3)
       builder
       expression_parser
+      htmlentities
+      nokogiri
       twitter-text
     will_paginate (3.0.7)
     ya2yaml (0.31)
@@ -639,7 +662,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-throttle (~> 0.3.0)
   rack-utf8_sanitizer
-  rails (= 4.1.11)
+  rails
   rails-assets-notifyjs!
   rails3-generators
   rails3-jquery-autocomplete
diff --git a/app/controllers/projects/collaborators_controller.rb b/app/controllers/projects/collaborators_controller.rb
index 602df4857..cc8501864 100644
--- a/app/controllers/projects/collaborators_controller.rb
+++ b/app/controllers/projects/collaborators_controller.rb
@@ -1,6 +1,4 @@
 class Projects::CollaboratorsController < Projects::BaseController
-  respond_to :html, :json
-
   before_action :authenticate_user!
   before_action :authorize_collaborators
 
@@ -9,7 +7,6 @@ class Projects::CollaboratorsController < Projects::BaseController
 
   def index
     @collaborators = Collaborator.find_by_project(@project)
-    respond_with @collaborators
   end
 
   def find
@@ -20,7 +17,6 @@ class Projects::CollaboratorsController < Projects::BaseController
       groups = groups.search(params[:term]).first(5)
     end
     @collaborators = (users | groups).map{|act| Collaborator.new(actor: act, project: @project)}
-    respond_with @collaborators
   end
 
   def create
diff --git a/app/views/layouts/menu/_new_top.html.slim b/app/views/layouts/menu/_new_top.html.slim
index 39bd5a36c..116efe7da 100644
--- a/app/views/layouts/menu/_new_top.html.slim
+++ b/app/views/layouts/menu/_new_top.html.slim
@@ -12,7 +12,7 @@ nav.navbar.navbar-inverse.top_menu role = "navigation"
     #top-menu-navbar-collapse.collapse.navbar-collapse
       ul.nav.navbar-nav
         - (collection = t 'top_menu').each do |base, title|
-          - if policy(base).index?
+          - if policy(base.to_s.singularize.to_sym).index?
             li class=top_menu_class(base)
               a href=send("#{base}_path")
                 i.fa.hidden-sm                     class=top_menu_icon(base)
diff --git a/config/application.rb b/config/application.rb
index 109aa5c31..d1193cd41 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -61,6 +61,9 @@ module Rosa
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+
     config.log_redis = false
 
     config.angular_templates.ignore_prefix = 'angularjs/templates/'
diff --git a/config/environment.rb b/config/environment.rb
index b35a7204e..ee8d90dc6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-Rosa::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d787c3e76..57409c42e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -14,21 +14,21 @@ class DisableAssetsLogger
   end
 end
 
-Rosa::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
+Rails.application.configure do
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 10.minutes }
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
   #config.action_mailer.raise_delivery_errors = true
   #config.action_mailer.perform_deliveries = true
@@ -36,24 +36,32 @@ Rosa::Application.configure do
   config.action_mailer.smtp_settings = { host: "localhost", port: 1025 }
   config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
   #config.active_support.deprecation = false
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Do not compress assets
+  # Debug mode disables concatenation and preprocessing of assets.
   config.assets.compress = false
 
-  # Expands the lines which load the assets
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
 
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
   config.middleware.insert_before Rails::Rack::Logger, DisableAssetsLogger
 
-  config.eager_load = false
   config.log_redis = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a8adc2c69..811f4d3b6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,77 +1,86 @@
-Rosa::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-#  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # For nginx:
-  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  config.assets.css_compressor = :sass
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Generate digests for assets URLs.
+  config.assets.digest = true
 
-  # Use a different cache store in production
+  # `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
+  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
   config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 10.minutes }
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = { host: 'abf.io' }
   config.delivery_method = :sendmail
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Force SSL
-  # config.force_ssl = true
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
-  # Generate digests for assets URLs
-  config.assets.digest = true
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile +=
-    %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js moment/ru.js
-       codemirror_editor.js codemirror_editor.css new_application.css new_application.js angular-locale_ru-ru.js)
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  config.assets.css_compressor = :sass
-
-  config.eager_load = true
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 
   config.assets.logger = Logger.new $stdout
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b35839d5a..be0dbaa74 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,21 +1,30 @@
-Rosa::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Show full error reports and disable caching
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -23,22 +32,15 @@ Rosa::Application.configure do
   config.action_mailer.delivery_method = :test
   config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
   config.cache_store = :memory_store, { size: 64.megabytes }
-  config.eager_load = false
-  config.log_redis = true
+  config.log_redis   = true
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..c690a7de1
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile += %w(
+  login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js
+  moment/ru.js codemirror_editor.js codemirror_editor.css new_application.css
+  new_application.js angular-locale_ru-ru.js
+)
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 54516e3f2..7a06a89f0 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 9e8b0131f..ac033bf9d 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,10 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index f68e0056e..4ba1dc532 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,7 +2,6 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
 
 Mime::Type.register "text/plain", 'diff'
 Mime::Type.register "text/plain", 'patch'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index c384dd3bb..9789bbec1 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rosa::Application.config.session_store :cookie_store, key: '_rosa_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Rosa::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_rosa_session'
diff --git a/config/routes.rb b/config/routes.rb
index 94832cf89..0befa26ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-Rosa::Application.routes.draw do
+Rails.application.routes.draw do
 
   # ActiveAdmin routes.
   ActiveAdmin.routes(self)