Skip to content

Commit cdeed13

Browse files
committed
small fix
1 parent a46558f commit cdeed13

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 2
12+
end_of_line = lf
13+
14+
[*.md]
15+
trim_trailing_whitespace = true

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ GEM
9797
nokogiri (>= 1.5.9)
9898
mail (2.7.0)
9999
mini_mime (>= 0.1.1)
100-
marcel (0.3.2)
100+
marcel (0.3.3)
101101
mimemagic (~> 0.3.2)
102102
method_source (0.9.0)
103103
mimemagic (0.3.2)
@@ -152,7 +152,7 @@ GEM
152152
rb-fsevent (0.10.3)
153153
rb-inotify (0.9.10)
154154
ffi (>= 0.5.0, < 2)
155-
rubocop (0.59.0)
155+
rubocop (0.59.1)
156156
jaro_winkler (~> 1.5.1)
157157
parallel (~> 1.10)
158158
parser (>= 2.5, != 2.5.1.1)
@@ -197,7 +197,7 @@ GEM
197197
turbolinks-source (5.2.0)
198198
tzinfo (1.2.5)
199199
thread_safe (~> 0.1)
200-
uglifier (4.1.18)
200+
uglifier (4.1.19)
201201
execjs (>= 0.3.0, < 3)
202202
unicode-display_width (1.4.0)
203203
validates_timeliness (5.0.0.alpha3)

test/dummy/app/controllers/forms_controller.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# frozen_string_literal: true
22

33
class FormsController < ApplicationController
4-
layout "application", only: %i[index new create edit update]
5-
before_action :set_form, only: %i[:show edit update destroy]
4+
layout "application"
5+
6+
before_action :set_form, only: %i[edit update destroy]
67

78
# GET /forms
89
def index

test/dummy/app/models/field_options.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
class FieldOptions < DuckRecord::Base
4-
include ActsAsDefaultValue
4+
include FormCore::ActsAsDefaultValue
55
include EnumAttributeLocalizable
66

77
class_attribute :keeping_old_serialization

0 commit comments

Comments
 (0)