Upgraded to Rails 4

config/environments/development.rb

@@ -1,6 +1,8 @@
 Fetsite::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.serve_static_files = false
+
   # 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 web server when you make code changes.

config/environments/production.rb

@@ -3,7 +3,8 @@ Fetsite::Application.configure do
 
   # Code is not reloaded between requests
   config.cache_classes = true
-
+  config.serve_static_files = true
+  
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

config/environments/test.rb

@@ -8,7 +8,7 @@ Fetsite::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = false
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil

config/initializers/devise.rb

@@ -237,7 +237,7 @@ Devise.setup do |config|
   :bind_dn =>secrets["ldap"]['bind'],
   :password => secrets["ldap"]['password']
 
-
+config.secret_key = '8dbd2a8c1cbffb76ffd5381a58078b2f1fd622e7403035cc40e9d1346d7acf6f090a3f424b2ecc8365ad435e5bfea96ddd30eec3ffe09e876a7e0033a7ab4331'
   
   # ==> Warden configuration<<
   # If you want to use other strategies, that are not supported by Devise, or

config/initializers/locale.rb

@@ -1 +1 @@
-I18n.default_locale = :de
+#I18n.default_locale = :de

config/initializers/themes_for_rails.rb

@@ -1,9 +1,9 @@
-ThemesForRails.config do |config|
+#ThemesForRails.config do |config|
   #
   # If you have placed your themes like the example path above within the asset pipeline:
-  config.themes_dir = 'app/views/themes'
-  config.assets_dir = 'app/assets/assets/themes/:name'
-  config.views_dir = 'app/views/themes/:name'
-  config.use_sass=true 
+#  config.themes_dir = 'app/views/themes'
+#  config.assets_dir = 'app/assets/assets/themes/:name'
+#  config.views_dir = 'app/views/themes/:name'
+#  config.use_sass=true 
 # ...
-end
+#end

config/routes.rb

@@ -1,51 +1,52 @@
- Fetsite::Application.routes.draw do
-   resources :comments, except: [:show] do
-     collection do
-       get 'hide'
-     end
-   end
-
-       resources :comments, contstraints: {id: /[0-9]+/}, only: :show
+Fetsite::Application.routes.draw do
+  resources :comments, except: [:show] do
+    collection do
+      get 'hide'
+    end
+  end
+  resources :comments, contstraints: {id: /[0-9]+/}, only: :show
 
 
 ## Inserted for testing tests
-      resources :members , controller: :fetprofiles , as: :fetprofiles do
-        collection do
-          get 'verwalten'
-          get 'internlist'
-        end
-      end
-     resources :gremien do 
-        collection do 
-          get 'verwalten'
-        end
-      end
+  resources :members , controller: :fetprofiles , as: :fetprofiles do
+    collection do
+      get 'verwalten'
+      get 'internlist'
+    end
+  end
+  resources :gremien do 
+    collection do 
+      get 'verwalten'
+    end
+  end
 #
     # #-------------------------
 
-   namespace :survey do
-     resources :questions do
-       member do
-         get :answer
+  namespace :survey do
+    resources :questions do
+      member do
+        get :answer
         put :answer
-         get 'flag'
-         get :create_from_template
-       end
-     end
-     resources :choices
-
-   end
-   
-  themes_for_rails
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
-  resources :home, :only=>[:index] do
-end
-resources :emails, :only=>[:index] do
-     collection do
- get :daily_reminder
+        get 'flag'
+        get :create_from_template
+      end
     end
-end
+    resources :choices
+    
+  end
+   
+  #themes_for_rails
+  
+  resources :home, :only=>[:index] do
+  end
+  resources :emails, :only=>[:index] do
+    collection do
+      get :daily_reminder
+    end
+  end
   get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language"
+  
+  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   scope '(:locale)/admin' do
     resources :users, :only=>[]  do 
       collection do
@@ -71,7 +72,7 @@ end
       end
     end
   end
-  devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
+#  devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
   #match '/auth/:provider/callback', to: "session#new", via: [:get, :post]