From 0f9e39b7bed9f5cfd6c55473fe2053a6303a497d Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Thu, 19 Jan 2017 00:49:36 +0100
Subject: [PATCH] Add ruby 2.4

---
 .rubocop.yml  | 14 +++++++++++---
 .ruby-version |  2 +-
 .travis.yml   |  1 +
 Gemfile.lock  |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 83ccd03..b520263 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -171,6 +171,10 @@ Rails/TimeZone:
   Exclude:
     - "spec/lib/**/*"
 
+Rails/Delegate:
+  Exclude:
+    - "lib/**/*"
+
 Style/SingleLineMethods:
   Exclude:
     - "test/dummy/app/models/*"
@@ -181,13 +185,17 @@ Style/EmptyLineBetweenDefs:
 Style/NumericPredicate:
   EnforcedStyle: comparison
 
+### backward compatibility
+
+# only with ruby >= 2.3
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Rails/Delegate:
-  Exclude:
-    - "lib/**/*"
+# only with ruby >= 2.4
+Performance/RegexpMatch:
+  Enabled: false
 
+# for rails 4 and ruby < 2.2.2
 Rails/HttpPositionalArguments:
   Exclude:
     - "spec/controllers/diaspora_federation/fixtures_rails4_spec.rb"
diff --git a/.ruby-version b/.ruby-version
index bb576db..6b4950e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3
+2.4
diff --git a/.travis.yml b/.travis.yml
index 61bb83d..61a0fc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.4.0
   - 2.3.3
   - 2.2.5
   - 2.1
diff --git a/Gemfile.lock b/Gemfile.lock
index 7746a44..b6420d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -321,4 +321,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.6
+   1.13.7