mirror of
				https://github.com/mperham/sidekiq.git
				synced 2022-11-09 13:52:34 -05:00 
			
		
		
		
	Relax slim version constraint, fixes #970
This commit is contained in:
		
							parent
							
								
									446748570d
								
							
						
					
					
						commit
						d5f8b45957
					
				
					 5 changed files with 9 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -1,6 +1,7 @@
 | 
			
		|||
HEAD
 | 
			
		||||
2.12.2
 | 
			
		||||
-----------
 | 
			
		||||
 | 
			
		||||
- Relax slim version requirement to >= 1.1.0
 | 
			
		||||
- Refactor historical stats to use TTL, not explicit cleanup. [grosser, #971]
 | 
			
		||||
 | 
			
		||||
2.12.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								Gemfile
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Gemfile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,6 +1,8 @@
 | 
			
		|||
source 'http://rubygems.org'
 | 
			
		||||
gemspec
 | 
			
		||||
 | 
			
		||||
gem 'slim', '1.1.0' # earliest verson supported
 | 
			
		||||
 | 
			
		||||
gem 'sqlite3', :platform => :mri
 | 
			
		||||
 | 
			
		||||
group :test do
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ require 'yaml'
 | 
			
		|||
require 'sinatra/base'
 | 
			
		||||
require 'slim'
 | 
			
		||||
 | 
			
		||||
raise "The Sidekiq Web UI requires slim 1.3.8 or greater.  You have slim v#{Slim::VERSION}" if Gem::Version.new(Slim::VERSION) < Gem::Version.new('1.3.8')
 | 
			
		||||
raise "The Sidekiq Web UI requires slim 1.1.0 or greater.  You have slim v#{Slim::VERSION}" if Gem::Version.new(Slim::VERSION) < Gem::Version.new('1.1.0')
 | 
			
		||||
 | 
			
		||||
require 'sidekiq'
 | 
			
		||||
require 'sidekiq/api'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@ gem 'sidekiq', :path => '..'
 | 
			
		|||
gem 'capistrano'
 | 
			
		||||
 | 
			
		||||
# sidekiq-web dependencies
 | 
			
		||||
gem 'slim', '1.3.8'
 | 
			
		||||
gem 'slim', '1.1.0'
 | 
			
		||||
gem 'sinatra'
 | 
			
		||||
gem 'compass'
 | 
			
		||||
gem 'sprockets'
 | 
			
		||||
 | 
			
		||||
gem 'shotgun'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 | 
			
		|||
  gem.add_dependency                  'celluloid', '>= 0.14.1'
 | 
			
		||||
  gem.add_dependency                  'json'
 | 
			
		||||
  gem.add_development_dependency      'sinatra'
 | 
			
		||||
  gem.add_development_dependency      'slim', '>= 1.3.8'
 | 
			
		||||
  gem.add_development_dependency      'slim', '>= 1.1.0'
 | 
			
		||||
  gem.add_development_dependency      'minitest', '~> 5'
 | 
			
		||||
  gem.add_development_dependency      'rake'
 | 
			
		||||
  gem.add_development_dependency      'actionmailer'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue