Merge pull request #2453 from TracksApp/dependabot/bundler/aasm-5.1.1

Bump aasm from 4.12.3 to 5.1.1

app/controllers/preferences_controller.rb

@@ -9,8 +9,8 @@ class PreferencesController < ApplicationController
   def update
     @prefs = current_user.prefs
     @user = current_user
-    user_updated = current_user.update_attributes(user_params)
-    prefs_updated = current_user.preference.update_attributes(prefs_params)
+    user_updated = current_user.update(user_params)
+    prefs_updated = current_user.preference.update(prefs_params)
     if (user_updated && prefs_updated)
       if params['user']['password'].present? # password updated?
         logout_user t('preferences.password_changed')

app/models/context.rb

@@ -35,7 +35,7 @@ class Context < ApplicationRecord
 
   validates_presence_of :name, :message => "context must have a name"
   validates_length_of :name, :maximum => 255, :message => "context name must be less than 256 characters"
-  validates_uniqueness_of :name, :message => "already exists", :scope => "user_id"
+  validates_uniqueness_of :name, :message => "already exists", :scope => "user_id", :case_sensitive => false
 
   def self.null_object
     NullContext.new

app/models/project.rb

@@ -18,7 +18,7 @@ class Project < ApplicationRecord
 
   validates_presence_of :name
   validates_length_of :name, :maximum => 255
-  validates_uniqueness_of :name, :scope => "user_id"
+  validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => true
 
   acts_as_list :scope => 'user_id = #{user_id} AND state = \'#{state}\'', :top_of_list => 0
 

app/models/recurring_todo.rb

@@ -12,8 +12,8 @@ class RecurringTodo < ApplicationRecord
 
   include AASM
   aasm :column => :state do
-    state :active, :initial => true, :before_enter => Proc.new { |t| t.occurrences_count = 0 }
-    state :completed, :before_enter => Proc.new { |t| t.completed_at = Time.zone.now }, :before_exit => Proc.new { |t| t.completed_at = nil }
+    state :active, :initial => true, :before_enter => Proc.new { self.occurrences_count = 0 }
+    state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil }
 
     event :complete do
       transitions :to => :completed, :from => [:active]

app/models/todo.rb

@@ -70,13 +70,13 @@ class Todo < ApplicationRecord
 
   # state machine
   include AASM
-  aasm_initial_state = Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active}
+  aasm_initial_state = Proc.new { (self.show_from && self.user && (self.show_from > self.user.date)) ? :deferred : :active}
 
   aasm :column => :state do
 
     state :active
-    state :completed, :before_enter => Proc.new { |t| t.completed_at = Time.zone.now }, :before_exit => Proc.new { |t| t.completed_at = nil}
-    state :deferred,  :before_exit => Proc.new { |t| t[:show_from] = nil }
+    state :completed, :before_enter => Proc.new { self.completed_at = Time.zone.now }, :before_exit => Proc.new { self.completed_at = nil}
+    state :deferred,  :before_exit => Proc.new { self[:show_from] = nil }
     state :pending
 
     event :defer do

app/models/user.rb

@@ -105,7 +105,7 @@ class User < ApplicationRecord
   validates_presence_of :password_confirmation, if: :password_required?
   validates_confirmation_of :password
   validates_length_of :login, within: 3..80
-  validates_uniqueness_of :login, on: :create
+  validates_uniqueness_of :login, on: :create, :case_sensitive => false
   validate :validate_auth_type
   validates :email, :allow_blank => true, format: { with: URI::MailTo::EMAIL_REGEXP }
 

app/views/contexts/show.html.erb

@@ -21,5 +21,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :file => "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div>

app/views/feedlist/index.html.erb

@@ -19,5 +19,5 @@
 </div>
 
 <div id="input_box">
-  <%= render :file => "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div>

app/views/projects/show.html.erb

@@ -42,5 +42,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :file => "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div>

app/views/todos/index.html.erb

@@ -12,5 +12,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :file => "sidebar/sidebar" %>
-</div>
+  <%= render :template => "sidebar/sidebar" %>
+</div>

app/views/todos/tag.html.erb

@@ -27,5 +27,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :file => "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div>