From 1816d4b80ff8a3569a7aa00ee322681e5f1aa57d Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Wed, 7 Feb 2018 11:20:30 +1030
Subject: [PATCH] Merge pull request #31912 from robin850/upgrade-sdoc-1-0

Refer to a stable release of SDoc
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e45bbf88f..86771138a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", requi
 gem "stopgap_13632", platforms: :mri if RUBY_VERSION == "2.2.8"
 
 group :doc do
-  gem "sdoc", github: "robin850/sdoc", branch: "upgrade"
+  gem "sdoc", "~> 1.0"
   gem "redcarpet", "~> 3.2.3", platforms: :ruby
   gem "w3c_validators"
   gem "kindlerb", "~> 1.2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 89bd25145b..8f83809904 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,14 +23,6 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 2.0)
 
-GIT
-  remote: https://github.com/robin850/sdoc.git
-  revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c
-  branch: upgrade
-  specs:
-    sdoc (1.0.0.rc2)
-      rdoc (~> 5.0)
-
 PATH
   remote: .
   specs:
@@ -375,7 +367,7 @@ GEM
       rake
     rake (12.2.1)
     rb-fsevent (0.10.2)
-    rdoc (5.1.0)
+    rdoc (6.0.1)
     redcarpet (3.2.3)
     redis (4.0.1)
     redis-namespace (1.6.0)
@@ -420,6 +412,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sdoc (1.0.0)
+      rdoc (>= 5.0)
     selenium-webdriver (3.5.1)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
@@ -554,7 +548,7 @@ DEPENDENCIES
   resque-scheduler
   rubocop (>= 0.47)
   sass-rails
-  sdoc!
+  sdoc (~> 1.0)
   sequel
   sidekiq
   sneakers
-- 
GitLab