diff --git a/Gemfile.lock b/Gemfile.lock index 16b7293aa..338636dc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.63.1) + rubocop (0.64.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) diff --git a/app/models/observer/ticket/ref_object_touch.rb b/app/models/observer/ticket/ref_object_touch.rb index 85d529c57..ec415216f 100644 --- a/app/models/observer/ticket/ref_object_touch.rb +++ b/app/models/observer/ticket/ref_object_touch.rb @@ -29,7 +29,7 @@ class Observer::Ticket::RefObjectTouch < ActiveRecord::Observer end # touch new/current customer - record.customer&.touch + record.customer&.touch # rubocop:disable Rails/SkipsModelValidations # touch old organization if changed organization_id_changed = record.saved_changes['organization_id'] diff --git a/db/migrate/20180502015927_issue_1219_zhtw_locale_typo.rb b/db/migrate/20180502015927_issue_1219_zhtw_locale_typo.rb index 08d19beca..04ca99524 100644 --- a/db/migrate/20180502015927_issue_1219_zhtw_locale_typo.rb +++ b/db/migrate/20180502015927_issue_1219_zhtw_locale_typo.rb @@ -12,7 +12,7 @@ class Issue1219ZhtwLocaleTypo < ActiveRecord::Migration[5.1] Locale.find_by(locale: 'zj-tw')&.update(locale: 'zh-tw') end - Translation.where(locale: 'zj-tw')&.update_all(locale: 'zh-tw') + Translation.where(locale: 'zj-tw')&.update_all(locale: 'zh-tw') # rubocop:disable Rails/SkipsModelValidations User.where('preferences LIKE ?', "%\nlocale: zj-tw\n%").each do |u| u.preferences[:locale] = 'zh-tw' u.save @@ -29,7 +29,7 @@ class Issue1219ZhtwLocaleTypo < ActiveRecord::Migration[5.1] Locale.find_by(locale: 'zh-tw')&.update(locale: 'zj-tw') end - Translation.where(locale: 'zh-tw')&.update_all(locale: 'zj-tw') + Translation.where(locale: 'zh-tw')&.update_all(locale: 'zj-tw') # rubocop:disable Rails/SkipsModelValidations User.where('preferences LIKE ?', "%\nlocale: zh-tw\n%").each do |u| u.preferences[:locale] = 'zj-tw' u.save