From 3d0246d18ad23de023026413c245d520ce5b09f1 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 19 Aug 2016 03:08:47 +0200
Subject: [PATCH] use ruby 2.3 by default

---
 .rubocop.yml  | 13 +++++++++----
 .ruby-version |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 95473c6..7972bc7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,6 +24,12 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Max: 1500
 
+# Raise AbcSize from 15 to 20
+Metrics/AbcSize:
+  Max: 20
+  Exclude:
+    - "lib/diaspora_federation/test/factories.rb"
+
 # No space makes the method definition shorter and differentiates
 # from a regular assignment.
 Style/SpaceAroundEqualsInParameterDefault:
@@ -152,10 +158,6 @@ Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:
   Max: 10
-Metrics/AbcSize:
-  Max: 20
-  Exclude:
-    - "lib/diaspora_federation/test/factories.rb"
 
 Rails/TimeZone:
   Exclude:
@@ -170,3 +172,6 @@ Style/EmptyLineBetweenDefs:
 
 Style/NumericPredicate:
   EnforcedStyle: comparison
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 8bbe6cf..bb576db 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2
+2.3