suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade sinatra and sinatra-contrib

Browse Source
This commit is contained in:
Konstantin Haase 2012-12-12 18:19:48 +01:00
parent bc1c960c20
commit ea183ee620
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@ -6,12 +6,13 @@ 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-contrib', 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'
gem 'unicorn' gem 'unicorn'
# gem 'sinatra', github: 'sinatra/sinatra'
gem "sentry-raven", github: 'getsentry/raven-ruby' gem "sentry-raven", github: 'getsentry/raven-ruby'
gem 'yard-sinatra', github: 'rkh/yard-sinatra' gem 'yard-sinatra', github: 'rkh/yard-sinatra'
gem 'rack-contrib', github: 'rack/rack-contrib' gem 'rack-contrib', github: 'rack/rack-contrib'
@ -36,5 +37,5 @@ end
group :development, :test do group :development, :test do
gem 'rake', '~> 0.9.2' gem 'rake', '~> 0.9.2'
gem 'micro_migrations', git: 'http://gist.github.com/2087829.git' gem 'micro_migrations', git: 'http://gist.github.com/4269321.git'
end end

38
Gemfile.lock
View File

@ -34,6 +34,27 @@ 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: c5c2d32e688123a1a1cab4b391447e995957c94f
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: 461dafaf6049597551ad261a3320f912785377be
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
@ -79,8 +100,8 @@ GIT
travis-support (0.0.1) travis-support (0.0.1)
GIT GIT
remote: http://gist.github.com/2087829.git remote: http://gist.github.com/4269321.git
revision: c766c06b0bdbda3bd96c3f4e376249cafcbbfaaa revision: 8e2d21b924a69dd48191df6a18e51769f5a88614
specs: specs:
micro_migrations (0.0.1) micro_migrations (0.0.1)
@ -243,17 +264,6 @@ 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.3.3) slop (3.3.3)
sprockets (2.2.2) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
@ -300,6 +310,8 @@ DEPENDENCIES
rspec (~> 2.11) rspec (~> 2.11)
sentry-raven! sentry-raven!
simple_states! simple_states!
sinatra!
sinatra-contrib!
travis-api! travis-api!
travis-core! travis-core!
travis-sidekiqs! travis-sidekiqs!