Rubocop: Style/ElseAlignment

- Align else with if
Rubocop: Lint/EndAlignment
 - Align end with if

lib/jekyll/regenerator.rb

@@ -155,20 +155,21 @@ module Jekyll
     #
     # Returns the read metadata.
     def read_metadata
-      @metadata = if !disabled? && File.file?(metadata_file)
+      @metadata =
-        content = File.binread(metadata_file)
+        if !disabled? && File.file?(metadata_file)
+          content = File.binread(metadata_file)
 
-        begin
+          begin
-          Marshal.load(content)
+            Marshal.load(content)
-        rescue TypeError
+          rescue TypeError
-          SafeYAML.load(content)
+            SafeYAML.load(content)
-        rescue ArgumentError => e
+          rescue ArgumentError => e
-          Jekyll.logger.warn("Failed to load #{metadata_file}: #{e}")
+            Jekyll.logger.warn("Failed to load #{metadata_file}: #{e}")
+            {}
+          end
+        else
           {}
         end
-      else
-        {}
-      end
     end
   end
 end

lib/jekyll/static_file.rb

@@ -118,13 +118,13 @@ module Jekyll
     # be overriden in the collection's configuration in _config.yml.
     def url
       @url ||= if @collection.nil?
-        relative_path
+                 relative_path
-      else
+               else
-        ::Jekyll::URL.new({
+                 ::Jekyll::URL.new({
-          :template => @collection.url_template,
+                   :template => @collection.url_template,
-          :placeholders => placeholders
+                   :placeholders => placeholders
-        })
+                 })
-      end.to_s.gsub(/\/$/, '')
+               end.to_s.gsub(/\/$/, '')
     end
 
     # Returns the type of the collection if present, nil otherwise.

lib/jekyll/tags/include.rb

@@ -42,12 +42,12 @@ module Jekyll
           markup = markup[match.end(0)..-1]
 
           value = if match[2]
-            match[2].gsub(/\\"/, '"')
+                    match[2].gsub(/\\"/, '"')
-          elsif match[3]
+                  elsif match[3]
-            match[3].gsub(/\\'/, "'")
+                    match[3].gsub(/\\'/, "'")
-          elsif match[4]
+                  elsif match[4]
-            context[match[4]]
+                    context[match[4]]
-          end
+                  end
 
           params[match[1]] = value
         end