Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
This commit is contained in:
		
							
								
								
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							@@ -8,8 +8,6 @@ gem 'sass-rails', '~> 5.0'
 | 
			
		||||
gem 'uglifier', '>= 1.3.0'
 | 
			
		||||
gem 'coffee-rails', '~> 4.1.0'
 | 
			
		||||
gem 'jquery-rails'
 | 
			
		||||
gem 'jbuilder', '~> 2.0'
 | 
			
		||||
gem 'sdoc', '~> 0.4.0', group: :doc
 | 
			
		||||
gem 'puma'
 | 
			
		||||
 | 
			
		||||
gem 'hamlit-rails'
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								Gemfile.lock
									
									
									
									
									
								
							@@ -198,9 +198,6 @@ GEM
 | 
			
		||||
      parser (>= 2.2.3.0)
 | 
			
		||||
      term-ansicolor (>= 1.3.2)
 | 
			
		||||
      terminal-table (>= 1.5.1)
 | 
			
		||||
    jbuilder (2.6.0)
 | 
			
		||||
      activesupport (>= 3.0.0, < 5.1)
 | 
			
		||||
      multi_json (~> 1.2)
 | 
			
		||||
    jmespath (1.3.1)
 | 
			
		||||
    jquery-rails (4.1.1)
 | 
			
		||||
      rails-dom-testing (>= 1, < 3)
 | 
			
		||||
@@ -231,7 +228,6 @@ GEM
 | 
			
		||||
    mimemagic (0.3.2)
 | 
			
		||||
    mini_portile2 (2.1.0)
 | 
			
		||||
    minitest (5.10.1)
 | 
			
		||||
    multi_json (1.12.1)
 | 
			
		||||
    net-scp (1.2.1)
 | 
			
		||||
      net-ssh (>= 2.6.5)
 | 
			
		||||
    net-ssh (4.0.1)
 | 
			
		||||
@@ -310,8 +306,6 @@ GEM
 | 
			
		||||
      thor (>= 0.18.1, < 2.0)
 | 
			
		||||
    rainbow (2.1.0)
 | 
			
		||||
    rake (12.0.0)
 | 
			
		||||
    rdoc (4.2.2)
 | 
			
		||||
      json (~> 1.4)
 | 
			
		||||
    react-rails (1.10.0)
 | 
			
		||||
      babel-transpiler (>= 0.7.0)
 | 
			
		||||
      coffee-script-source (~> 1.8)
 | 
			
		||||
@@ -381,9 +375,6 @@ GEM
 | 
			
		||||
      sprockets (>= 2.8, < 4.0)
 | 
			
		||||
      sprockets-rails (>= 2.0, < 4.0)
 | 
			
		||||
      tilt (>= 1.1, < 3)
 | 
			
		||||
    sdoc (0.4.1)
 | 
			
		||||
      json (~> 1.7, >= 1.7.7)
 | 
			
		||||
      rdoc (~> 4.0)
 | 
			
		||||
    sidekiq (4.2.7)
 | 
			
		||||
      concurrent-ruby (~> 1.0)
 | 
			
		||||
      connection_pool (~> 2.2, >= 2.2.0)
 | 
			
		||||
@@ -483,7 +474,6 @@ DEPENDENCIES
 | 
			
		||||
  http
 | 
			
		||||
  httplog
 | 
			
		||||
  i18n-tasks (~> 0.9.6)
 | 
			
		||||
  jbuilder (~> 2.0)
 | 
			
		||||
  jquery-rails
 | 
			
		||||
  letter_opener
 | 
			
		||||
  letter_opener_web
 | 
			
		||||
@@ -514,7 +504,6 @@ DEPENDENCIES
 | 
			
		||||
  rubocop
 | 
			
		||||
  ruby-oembed
 | 
			
		||||
  sass-rails (~> 5.0)
 | 
			
		||||
  sdoc (~> 0.4.0)
 | 
			
		||||
  sidekiq
 | 
			
		||||
  sidekiq-unique-jobs
 | 
			
		||||
  simple-navigation
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user