Making progress

fairmondo · Jul 7, 2017 · 2d85f94 · 2d85f94
1 parent a1bc930
commit 2d85f94
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'paperclip', '~> 4.2.2'
 gem 'money-rails', '> 0.12.0' # dealing with money in activerecord
 gem 'monetize' # parsing money
 gem 'enumerize', '>= 0.5.1' # enums as symbols in ar
-gem 'state_machine' # State Machines in Rails
+gem 'state_machines-activerecord', '~> 0.5.0'
 gem 'amoeba'
 gem 'sanitize' # Parser based sanitization
 gem 'awesome_nested_set', '>= 3.0.0.rc.4' # tree structure for categories
@@ -61,17 +61,17 @@ gem 'handlebars_assets'
 
 ## Forms
 
-gem 'formtastic', '~> 2.3.0.rc3'
+gem 'formtastic', '~> 3.0.0'
 gem 'recaptcha', '~> 0.6.0', require: 'recaptcha/rails' # Captcha Gem
 
 # ---------- Controller ----------
 
 gem 'arcane' # Parameter management for strong_parameters
 gem 'canonical-rails' # canonical view links
-gem 'devise', '~> 3.5.10' # authentication
+gem 'devise', '~> 4.0.3' # authentication
 gem 'pundit' # authorization
 gem 'kaminari' # pagination
-gem 'responders'
+gem 'responders', '~> 2.0'
 
 # ---------- Mail ----------
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -206,12 +206,11 @@ GEM
     debug_inspector (0.0.3)
     delayed_paperclip (2.9.2)
       paperclip (>= 3.3)
-    devise (3.5.10)
+    devise (4.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     docile (1.1.5)
     easy_translate (0.5.0)
@@ -259,8 +258,8 @@ GEM
     ffaker (1.32.1)
     font-awesome-rails (4.7.0.2)
       railties (>= 3.2, < 5.2)
-    formtastic (2.3.1)
-      actionpack (>= 3.0)
+    formtastic (3.0.0)
+      actionpack (>= 3.2.13)
     friendly_id (5.2.1)
       activerecord (>= 4.0.0)
     git-version-bump (0.15.1)
@@ -623,6 +622,13 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     state_machine (1.2.0)
+    state_machines (0.5.0)
+    state_machines-activemodel (0.5.0)
+      activemodel (>= 4.1, < 5.2)
+      state_machines (>= 0.5.0)
+    state_machines-activerecord (0.5.0)
+      activerecord (>= 4.1, < 5.2)
+      state_machines-activemodel (>= 0.5.0)
     susy (2.1.3)
       sass (>= 3.3.0, < 3.5)
     temple (0.7.7)
@@ -701,7 +707,7 @@ DEPENDENCIES
   dalli
   database_cleaner
   delayed_paperclip (~> 2.9.2)
-  devise (~> 3.5.10)
+  devise (~> 4.0.3)
   email_spec
   enumerize (>= 0.5.1)
   exception_notification
@@ -712,7 +718,7 @@ DEPENDENCIES
   fastbill-automatic!
   ffaker (~> 1.32.1)
   font-awesome-rails (>= 4.2.0.0)
-  formtastic (~> 2.3.0.rc3)
+  formtastic (~> 3.0.0)
   friendly_id (>= 4.0.9)
   handlebars_assets
   hirb
@@ -769,7 +775,7 @@ DEPENDENCIES
   rake
   recaptcha (~> 0.6.0)
   redis-namespace (~> 1.5.2)
-  responders
+  responders (~> 2.0)
   rubocop
   rubyntlm
   sanitize
@@ -787,7 +793,7 @@ DEPENDENCIES
   sprite-factory
   sprockets
   sqlite3
-  state_machine
+  state_machines-activerecord (~> 0.5.0)
   susy (~> 2.1.1)
   therubyracer
   therubyrhino

diff --git a/app/controllers/article_templates_controller.rb b/app/controllers/article_templates_controller.rb
@@ -4,7 +4,7 @@
 
 class ArticleTemplatesController < ApplicationController
   respond_to :html
-  responders :location, :flash
+  responders :flash
 
   before_action -> { render_css_from_controller('articles') }, except: [:destroy]
   before_action :set_article_template, only: [:edit, :update, :destroy]

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
@@ -5,7 +5,6 @@
 class ArticlesController < ApplicationController
   include ArticleControllerFilters
 
-  responders :location
   respond_to :html
   respond_to :json, only: [:show, :index]
 

diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
@@ -3,7 +3,6 @@
 #   See the COPYRIGHT file for details.
 
 class FeedbacksController < ApplicationController
-  responders :location
   respond_to :html
   skip_before_action :authenticate_user!
 

diff --git a/app/controllers/line_items_controller.rb b/app/controllers/line_items_controller.rb
@@ -5,7 +5,6 @@
 class LineItemsController < ApplicationController
   respond_to :html
   respond_to :json, only: [:create]
-  responders :location
 
   skip_before_action :authenticate_user!, only: [:create, :update, :destroy]
   before_action :quantity_zero_means_destroy, only: [:update]

diff --git a/app/controllers/mass_uploads_controller.rb b/app/controllers/mass_uploads_controller.rb
@@ -3,7 +3,6 @@
 #   See the COPYRIGHT file for details.
 
 class MassUploadsController < ApplicationController
-  responders :location
   respond_to :html
   respond_to :csv, only: :show
 

diff --git a/app/controllers/ratings_controller.rb b/app/controllers/ratings_controller.rb
@@ -3,7 +3,7 @@
 #   See the COPYRIGHT file for details.
 
 class RatingsController < ApplicationController
-  responders :location, :flash
+  responders :flash
   respond_to :html
 
   before_action :set_user

diff --git a/app/controllers/refunds_controller.rb b/app/controllers/refunds_controller.rb
@@ -3,7 +3,7 @@
 #   See the COPYRIGHT file for details.
 
 class RefundsController < ApplicationController
-  responders :location, :flash
+  responders :flash
   respond_to :html
 
   def new

diff --git a/config/application.rb b/config/application.rb
@@ -63,6 +63,8 @@ class Application < Rails::Application
                                       :address_observer,
                                       :payment_observer]
 
+    config.active_record.raise_in_transactional_callbacks = true
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Berlin'