diff --git a/.rubocop.yml b/.rubocop.yml
index 5f3f52f0..576aca0f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,9 @@
 AllCops:
   Exclude:
     - db/schema.rb
+BlockLength:
+  Exclude:
+    - app/admin/*.rb
+    - config/routes.rb
+Rails/HttpPositionalArguments:
+  Enabled: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6acf27f7..6508f569 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,7 +91,7 @@ GEM
     brakeman (3.4.0)
     buftok (0.2.0)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
     coderay (1.1.1)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
@@ -192,7 +192,7 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_accept_language (2.0.5)
@@ -234,16 +234,15 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     modernizr-rails (2.7.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     mysql2 (0.4.4)
     naught (1.1.0)
     nenv (0.3.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -253,7 +252,6 @@ GEM
       request_store (~> 1.1)
     parser (2.3.1.4)
       ast (~> 2.2)
-    pkg-config (1.1.7)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
     powerpack (0.1.1)
@@ -296,7 +294,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     ransack (1.8.2)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -313,15 +311,15 @@ GEM
     request_store (1.3.1)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rubocop (0.43.0)
+    rubocop (0.44.1)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    ruby_dep (1.4.0)
-    ruby_parser (3.8.2)
+    ruby_dep (1.5.0)
+    ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -330,14 +328,14 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     select2-rails (3.5.10)
       thor (~> 0.14)
     sexp_processor (4.7.0)
     shellany (0.0.1)
-    simple_calendar (2.1.5)
+    simple_calendar (2.2.0)
       rails (>= 3.0)
     simple_oauth (0.3.1)
     simplecov (0.12.0)
@@ -346,7 +344,8 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    spring (1.7.2)
+    spring (2.0.0)
+      activesupport (>= 4.2)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -354,7 +353,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.12)
     strip_attributes (1.8.0)
       activemodel (>= 3.0, < 6.0)
     sysexits (1.2.0)
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 94a5e0bc..eea2cdd9 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -15,7 +15,7 @@ class MapsController < ApplicationController
   end
 
   def show
-    @kind = Kind.find_by_name params[:id]
+    @kind = Kind.find_by name: params[:id]
     respond_to do |format|
       format.html
       format.json do
diff --git a/app/models/event_callbacks.rb b/app/models/event_callbacks.rb
index d3138995..e390b5b4 100644
--- a/app/models/event_callbacks.rb
+++ b/app/models/event_callbacks.rb
@@ -13,17 +13,15 @@ class EventCallbacks
   end
 
   def self.after_create(event)
-    if event.event.nil?
-      EventMailer.create(event).deliver_now!
-      ModerationMailer.create(event).deliver_now!
-    end
+    return unless event.event.nil?
+    EventMailer.create(event).deliver_now!
+    ModerationMailer.create(event).deliver_now!
   end
 
   def self.before_update(event)
-    if event.moderated_changed? && event.moderated?
-      event.decision_time = Time.zone.now
-      create_repeats event if event.repeat > 0
-    end
+    return unless event.moderated_changed? && event.moderated?
+    event.decision_time = Time.zone.now
+    create_repeats event if event.repeat > 0
   end
 
   def self.after_update(event)
@@ -45,10 +43,9 @@ class EventCallbacks
   end
 
   def self.after_destroy(event)
-    if ActionMailer::Base.default_url_options[:host]
-      EventMailer.destroy(event).deliver_now
-      ModerationMailer.destroy(event).deliver_now
-    end
+    return unless ActionMailer::Base.default_url_options[:host]
+    EventMailer.destroy(event).deliver_now
+    ModerationMailer.destroy(event).deliver_now
   end
 
   # Create multiple events corresponding to a repetition
diff --git a/app/models/user.rb b/app/models/user.rb
index 8740a336..5895cf8a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,7 +24,7 @@ class User < ActiveRecord::Base
     conditions = warden_conditions.dup
     login = conditions.delete(:login)
     if login.present?
-      where(conditions).find_by_login login
+      where(conditions).find_by login: login
     else
       find_first(conditions)
     end