Merge pull request #224 from commercekitchen/staging

Staging
commercekitchen · Oct 31, 2019 · 8ecf170 · 8ecf170
2 parents 8e053b7 + f9944e6
commit 8ecf170
Show file tree

Hide file tree

Showing 338 changed files with 5,242 additions and 5,258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,4 +57,7 @@ config/secrets.yml
 /public/ckeditor_assets
 
 # Byebug history
-.byebug_history
+.byebug_history
+
+# Local environment
+/config/local_env.yml
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,9 +1,6 @@
 inherit_from:
   - .rubocop_todo.yml
 
-Rails:
-  Enabled: true
-
 AllCops:
   Exclude:
     - "bin/**/*"
@@ -12,6 +9,9 @@ AllCops:
     - "config/**/*"
     - "script/**/*"
 
+require:
+  - rubocop-rails
+
 Style/StringLiterals:
   EnforcedStyle: single_quotes
   SupportedStyles: