Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump sinatra from 1.1.2 to 2.2.3 #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump sinatra from 1.1.2 to 2.2.3 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source :rubygems
source :rubyforge

gem 'sinatra', '1.1.2'
gem 'sinatra', '2.2.3'
gem 'sinatra-mongoid', :require => 'sinatra/mongoid'

gem "bson_ext", "1.1.5"
Expand Down
20 changes: 13 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
GEM
remote: http://rubygems.org/
remote: http://rubygems.org/
specs:
activemodel (3.0.3)
Expand All @@ -21,7 +20,11 @@ GEM
mongo (~> 1.1.5)
tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre)
rack (1.2.1)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
rack (2.2.4)
rack-protection (2.2.3)
rack
rack-test (0.5.7)
rack (>= 1.0)
rspec (2.4.0)
Expand All @@ -32,14 +35,17 @@ GEM
rspec-expectations (2.4.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.4.0)
sinatra (1.1.2)
rack (~> 1.1)
tilt (~> 1.2)
ruby2_keywords (0.0.5)
sinatra (2.2.3)
mustermann (~> 2.0)
rack (~> 2.2)
rack-protection (= 2.2.3)
tilt (~> 2.0)
sinatra-mongoid (0.0.2)
mongo_ext
mongoid
sinatra
tilt (1.2.2)
tilt (2.0.11)
tzinfo (0.3.24)
will_paginate (3.0.pre2)
yajl-ruby (0.7.9)
Expand All @@ -52,6 +58,6 @@ DEPENDENCIES
bson_ext (= 1.1.5)
rack-test
rspec (= 2.4.0)
sinatra (= 1.1.2)
sinatra (= 2.2.3)
sinatra-mongoid
yajl-ruby