Merge 7e8e98e into 20e5376

sul-dlss-deprecated · Dec 8, 2015 · 376cb29 · 376cb29
2 parents 20e5376 + 7e8e98e
commit 376cb29
Show file tree

Hide file tree

Showing 47 changed files with 510 additions and 325 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,14 @@
 inherit_from: .rubocop_todo.yml
 
+Style/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+  Exclude:
+    - 'lib/dor/models/editable.rb'
+    - 'lib/dor/models/governable.rb'
+
+Style/ExtraSpacing:
+  AllowForAlignment: true
+
 Style/FileName:
   Enabled: true
   Exclude: