From 0871e5e5c1e6151a7ed3bdf7b22209ac11532b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 19 Apr 2017 20:02:03 -0400
Subject: Fix all style guides violations

Closes #28382
Closes #28651
---
 guides/rails_guides/markdown/renderer.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'guides/rails_guides/markdown/renderer.rb')

diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 20cbd568c9..9d43c10be6 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -94,15 +94,15 @@ HTML
           tree = version || edge
 
           root = file_path[%r{(.+)/}, 1]
-          path = case root
-                 when "abstract_controller", "action_controller", "action_dispatch"
-                   "actionpack/lib/#{file_path}"
-                 when /\A(action|active)_/
-                   "#{root.sub("_", "")}/lib/#{file_path}"
-                 else
-                   file_path
-                 end
-
+          path = \
+            case root
+            when "abstract_controller", "action_controller", "action_dispatch"
+              "actionpack/lib/#{file_path}"
+            when /\A(action|active)_/
+              "#{root.sub("_", "")}/lib/#{file_path}"
+            else
+              file_path
+            end
 
           "https://github.com/rails/rails/tree/#{tree}/#{path}"
         end
-- 
cgit v1.2.3


From e37283b52eb537bc0a1735968fbcc19a8cc17769 Mon Sep 17 00:00:00 2001
From: JD Gonzales <jd_gonzales@icloud.com>
Date: Fri, 12 May 2017 22:54:11 -0500
Subject: Old expression caught to many chars resulting in 404. Added minor
 change to resolve

---
 guides/rails_guides/markdown/renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guides/rails_guides/markdown/renderer.rb')

diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 9d43c10be6..7ac3d417a4 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -93,7 +93,7 @@ HTML
         def github_file_url(file_path)
           tree = version || edge
 
-          root = file_path[%r{(.+)/}, 1]
+          root = file_path[%r{(\w+)/}, 1]
           path = \
             case root
             when "abstract_controller", "action_controller", "action_dispatch"
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 guides/rails_guides/markdown/renderer.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'guides/rails_guides/markdown/renderer.rb')

diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 7ac3d417a4..583a8d348f 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RailsGuides
   class Markdown
     class Renderer < Redcarpet::Render::HTML
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 guides/rails_guides/markdown/renderer.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'guides/rails_guides/markdown/renderer.rb')

diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 583a8d348f..7ac3d417a4 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module RailsGuides
   class Markdown
     class Renderer < Redcarpet::Render::HTML
-- 
cgit v1.2.3