small fix

jasl · jasl · commit cdeed13398cf · 2018-09-17T07:12:05.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = true
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
@@ -152,7 +152,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rubocop (0.59.0)
+    rubocop (0.59.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -197,7 +197,7 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.18)
+    uglifier (4.1.19)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     validates_timeliness (5.0.0.alpha3)
diff --git a/test/dummy/app/controllers/forms_controller.rb b/test/dummy/app/controllers/forms_controller.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 class FormsController < ApplicationController
-  layout "application", only: %i[index new create edit update]
-  before_action :set_form, only: %i[:show edit update destroy]
+  layout "application"
+
+  before_action :set_form, only: %i[edit update destroy]
 
   # GET /forms
   def index
diff --git a/test/dummy/app/models/concerns/form_core/active_storage_bridge/attached/macros.rb b/test/dummy/app/models/concerns/form_core/active_storage_bridge/attached/macros.rb
diff --git a/test/dummy/app/models/concerns/form_core/acts_as_default_value.rb b/test/dummy/app/models/concerns/form_core/acts_as_default_value.rb
diff --git a/test/dummy/app/models/field_options.rb b/test/dummy/app/models/field_options.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FieldOptions < DuckRecord::Base
-  include ActsAsDefaultValue
+  include FormCore::ActsAsDefaultValue
   include EnumAttributeLocalizable
 
   class_attribute :keeping_old_serialization
