Layout/IndentationConsistency

.rubocop.yml

@@ -58,19 +58,6 @@ Layout/IndentHash:
     - 'config/environments/development.rb'
     - 'config/environments/production.rb'
 
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, rails
-Layout/IndentationConsistency:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/api/people_controller.rb'
-    - 'app/controllers/groups_controller.rb'
-    - 'app/controllers/members_controller.rb'
-    - 'app/controllers/people_controller.rb'
-    - 'app/helpers/authentication_helper.rb'
-
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.

app/controllers/activities_controller.rb

@@ -309,26 +309,26 @@ class ActivitiesController < ApplicationController
 
   private
 
-    # The Activity's group takes precedence over whatever's in the URL, set_group not required (and can be mislead)
-    def set_activity_and_group
-      @activity = Activity.find(params[:id] || params[:activity_id])
-      @group = @activity.group
-    end
+  # The Activity's group takes precedence over whatever's in the URL, set_group not required (and can be mislead)
+  def set_activity_and_group
+    @activity = Activity.find(params[:id] || params[:activity_id])
+    @group = @activity.group
+  end
 
-    def set_group
-      @group = Group.find(params[:group_id])
-    end
+  def set_group
+    @group = Group.find(params[:group_id])
+  end
 
-    def set_subgroup
-      @subgroup = Subgroup.find(params[:subgroup_id])
-    end
+  def set_subgroup
+    @subgroup = Subgroup.find(params[:subgroup_id])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def activity_params
-      params.require(:activity).permit(:name, :description, :location, :start, :end, :deadline, :reminder_at, :subgroup_division_enabled, :no_response_action)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def activity_params
+    params.require(:activity).permit(:name, :description, :location, :start, :end, :deadline, :reminder_at, :subgroup_division_enabled, :no_response_action)
+  end
 
-    def subgroup_params
-      params.require(:subgroup).permit(:name, :is_assignable)
-    end
+  def subgroup_params
+    params.require(:subgroup).permit(:name, :is_assignable)
+  end
 end

app/controllers/api/people_controller.rb

@@ -15,8 +15,8 @@ class Api::PeopleController < ApiController
 
   private
 
-    # Use callbacks to share common setup or constraints between actions.
-    def set_person
-      @person = Person.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_person
+    @person = Person.find(params[:id])
+  end
 end

app/controllers/groups_controller.rb

@@ -156,22 +156,22 @@ class GroupsController < ApplicationController
 
   private
 
-    # Use callbacks to share common setup or constraints between actions.
-    def set_group
-      @group = Group.find(params[:group_id] || params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_group
+    @group = Group.find(params[:group_id] || params[:id])
+  end
 
-    # Retrieve DefaultSubgroup to update or delete
-    def set_default_subgroup
-      @defaultsubgroup = DefaultSubgroup.find(params[:default_subgroup_id])
-    end
+  # Retrieve DefaultSubgroup to update or delete
+  def set_default_subgroup
+    @defaultsubgroup = DefaultSubgroup.find(params[:default_subgroup_id])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def group_params
-      params.require(:group).permit(:name)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def group_params
+    params.require(:group).permit(:name)
+  end
 
-    def default_subgroup_params
-      params.require(:default_subgroup).permit(:name, :is_assignable)
-    end
+  def default_subgroup_params
+    params.require(:default_subgroup).permit(:name, :is_assignable)
+  end
 end

app/controllers/members_controller.rb

@@ -134,24 +134,24 @@ class MembersController < ApplicationController
 
   private
 
-    # Use callbacks to share common setup or constraints between actions.
-    def set_member
-      @member = Member.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_member
+    @member = Member.find(params[:id])
+  end
 
-    def set_group
-      @group = Group.find(params[:group_id])
-    end
+  def set_group
+    @group = Group.find(params[:group_id])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def member_params
-      params.require(:member).permit(:person_id, :is_leader)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def member_params
+    params.require(:member).permit(:person_id, :is_leader)
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list
-    # through.  Note: differs from the ones in PeopleController because
-    # creating admins is not allowed.
-    def invite_params
-      params.require(:person).permit(:first_name, :infix, :last_name, :email, :birth_date)
-    end
+  # Never trust parameters from the scary internet, only allow the white list
+  # through.  Note: differs from the ones in PeopleController because
+  # creating admins is not allowed.
+  def invite_params
+    params.require(:person).permit(:first_name, :infix, :last_name, :email, :birth_date)
+  end
 end

app/controllers/people_controller.rb

@@ -100,18 +100,18 @@ class PeopleController < ApplicationController
 
   private
 
-    # Use callbacks to share common setup or constraints between actions.
-    def set_person
-      @person = Person.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_person
+    @person = Person.find(params[:id])
+  end
 
-    # Set person from calendar token
-    def set_person_from_token
-      @person = Person.find_by(calendar_token: params[:calendar_token])
-    end
+  # Set person from calendar token
+  def set_person_from_token
+    @person = Person.find_by(calendar_token: params[:calendar_token])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def person_params
-      params.require(:person).permit(:first_name, :infix, :last_name, :email, :birth_date, :is_admin)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def person_params
+    params.require(:person).permit(:first_name, :infix, :last_name, :email, :birth_date, :is_admin)
+  end
 end

app/helpers/authentication_helper.rb

@@ -86,10 +86,10 @@ module AuthenticationHelper
           return true
         end
 
-      return false
+        return false
       end
 
-    return false
+      return false
     end
   end