From f9ae061bfdf09cb3a76103f6047f816293ddbc6e Mon Sep 17 00:00:00 2001 From: Petrik Date: Mon, 2 Nov 2020 20:57:41 +0100 Subject: [PATCH] Use official sdoc gem instead of fork [skip ci] --- Gemfile | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 9381c2d3d1b..79a6df10c8d 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ group :rubocop do end group :doc do - gem "sdoc", github: "p8/sdoc", branch: "without-frames" + gem "sdoc", "~> 2.0" gem "redcarpet", "~> 3.2.3", platforms: :ruby gem "w3c_validators", "~> 1.3.6" gem "kindlerb", "~> 1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2e72a94767d..07547966fae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,14 +28,6 @@ GIT event_emitter websocket -GIT - remote: https://github.com/p8/sdoc.git - revision: a5e95cafdebf8a76ea21f2237e6349223f9ecac5 - branch: without-frames - specs: - sdoc (1.1.0) - rdoc (>= 5.0) - GIT remote: https://github.com/resque/redis-namespace.git revision: c31e63dc3cd5e59ef5ea394d4d46ac60d1e6f82e @@ -470,6 +462,8 @@ GEM sprockets (> 3.0) sprockets-rails tilt + sdoc (2.0.0) + rdoc (>= 5.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -619,7 +613,7 @@ DEPENDENCIES rubocop-performance rubocop-rails sass-rails - sdoc! + sdoc (~> 2.0) selenium-webdriver (>= 3.141.592) sequel sidekiq