downgrade sinatra

This commit is contained in:
Konstantin Haase 2013-01-24 22:15:55 +01:00
parent 36c40da55d
commit 7195d48e7b
2 changed files with 17 additions and 27 deletions

View File

@ -6,8 +6,8 @@ gemspec
gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-support', github: 'travis-ci/travis-support'
gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-core', github: 'travis-ci/travis-core'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
gem 'sinatra', github: 'sinatra/sinatra' gem 'sinatra' #github: 'sinatra/sinatra'
gem 'sinatra-contrib', github: 'sinatra/sinatra-contrib', require: nil gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
# TODO need to release the gem as soon i'm certain this change makes sense # TODO need to release the gem as soon i'm certain this change makes sense
gem 'simple_states', github: 'svenfuchs/simple_states', branch: 'sf-set-state-early' gem 'simple_states', github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'

View File

@ -34,27 +34,6 @@ GIT
yard-sinatra (1.0.0) yard-sinatra (1.0.0)
yard (~> 0.7) yard (~> 0.7)
GIT
remote: git://github.com/sinatra/sinatra-contrib.git
revision: 86c85007860bbaf596092547e7902ff5e0a07698
specs:
sinatra-contrib (1.4.0)
backports (>= 2.0)
eventmachine
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
GIT
remote: git://github.com/sinatra/sinatra.git
revision: 459369eb66224836f72e21bbece58c007f3422fa
specs:
sinatra (1.4.0)
rack (~> 1.4)
rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
GIT GIT
remote: git://github.com/svenfuchs/simple_states.git remote: git://github.com/svenfuchs/simple_states.git
revision: b1d45144e6a758220d7b21f83b08dc92de0d3196 revision: b1d45144e6a758220d7b21f83b08dc92de0d3196
@ -66,7 +45,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 09485de1c87b0223f9acce0a23ae9f68cfe89b6a revision: ba4e4a83b473393539728a3aeb8e3499ab1ef1bc
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.11) actionmailer (~> 3.2.11)
@ -96,7 +75,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-support.git remote: git://github.com/travis-ci/travis-support.git
revision: ff712aca1083a588974f835a84c574e6976aeb29 revision: a288008629ae7eab18c529008880d364daca82ce
specs: specs:
travis-support (0.0.1) travis-support (0.0.1)
@ -266,6 +245,17 @@ GEM
redis (~> 3) redis (~> 3)
redis-namespace redis-namespace
signature (0.1.6) signature (0.1.6)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
sinatra-contrib (1.3.2)
backports (>= 2.0)
eventmachine
rack-protection
rack-test
sinatra (~> 1.3.0)
tilt (~> 1.3)
slop (3.4.3) slop (3.4.3)
sprockets (2.2.2) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
@ -309,8 +299,8 @@ DEPENDENCIES
rspec (~> 2.11) rspec (~> 2.11)
sentry-raven! sentry-raven!
simple_states! simple_states!
sinatra! sinatra
sinatra-contrib! sinatra-contrib
travis-api! travis-api!
travis-core! travis-core!
travis-sidekiqs! travis-sidekiqs!