Rubocop: Style/ElseAlignment enabled

.rubocop.yml

@@ -145,7 +145,7 @@ Style/CommentIndentation:
 Style/ConstantName:
   Description: 'Constants should use SCREAMING_SNAKE_CASE.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case'
-  Enabled: false
+  Enabled: true
 
 Style/DefWithParentheses:
   Description: 'Use def with parentheses when there are arguments.'
@@ -177,7 +177,7 @@ Style/EachWithObject:
 
 Style/ElseAlignment:
   Description: 'Align elses and elsifs correctly.'
-  Enabled: false
+  Enabled: true
 
 Style/EmptyElse:
   Description: 'Avoid empty else-clauses.'

app/controllers/projects/refs_controller.rb

@@ -31,10 +31,10 @@ class Projects::RefsController < Projects::ApplicationController
 
   def logs_tree
     @offset = if params[:offset].present?
-             params[:offset].to_i
+                params[:offset].to_i
-           else
+              else
-             0
+                0
-           end
+              end
 
     @limit = 25
 

app/helpers/commits_helper.rb

@@ -112,12 +112,13 @@ module CommitsHelper
     person_name = user.nil? ? source_name : user.name
     person_email = user.nil? ? source_email : user.email
 
-    text = if options[:avatar]
+    text =
-            avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
+      if options[:avatar]
-            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
+        avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
-          else
+        %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
-            person_name
+      else
-          end
+        person_name
+      end
 
     options = {
       class: "commit-#{options[:source]}-link has_tooltip",

app/models/commit.rb

@@ -88,11 +88,12 @@ class Commit
   # cut off, ellipses (`&hellp;`) are prepended to the commit message.
   def description
     title_end = safe_message.index("\n")
-    @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
+    @description ||=
-                    "&hellip;".html_safe << safe_message[80..-1]
+      if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
-                  else
+        "&hellip;".html_safe << safe_message[80..-1]
-                    safe_message.split("\n", 2)[1].try(:chomp)
+      else
-                  end
+        safe_message.split("\n", 2)[1].try(:chomp)
+      end
   end
 
   def description?

app/services/projects/participants_service.rb

@@ -5,11 +5,12 @@ module Projects
     end
 
     def execute(note_type, note_id)
-      participating = if note_type && note_id
+      participating =
-                      participants_in(note_type, note_id)
+        if note_type && note_id
-                    else
+          participants_in(note_type, note_id)
-                      []
+        else
-                    end
+          []
+        end
       team_members = sorted(@project.team.members)
       participants = all_members + team_members + participating
       participants.uniq

config/initializers/acts_as_taggable_on_patch.rb

@@ -42,11 +42,12 @@ module ActsAsTaggableOn::Taggable
 
         elsif options.delete(:any)
           # get tags, drop out if nothing returned (we need at least one)
-          tags = if options.delete(:wild)
+          tags =
-            ActsAsTaggableOn::Tag.named_like_any(tag_list)
+            if options.delete(:wild)
-          else
+              ActsAsTaggableOn::Tag.named_like_any(tag_list)
-            ActsAsTaggableOn::Tag.named_any(tag_list)
+            else
-          end
+              ActsAsTaggableOn::Tag.named_any(tag_list)
+            end
 
           return empty_result unless tags.length > 0