moparisthebest
/
www.moparscape.org
mirror of https://github.com/moparisthebest/www.moparscape.org
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1074 from joneslee85/bump-sinatra 

Bump sinatra to 1.3.5
This commit is contained in:
Parker Moore 2013-02-28 12:55:13 -08:00
parent 4790b93980 960145fa20
commit f4f42823f6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -15,4 +15,4 @@ group :development do
gem 'liquid', '~> 2.3.0' gem 'liquid', '~> 2.3.0'
end end
gem 'sinatra', '~> 1.3.3' gem 'sinatra', '~> 1.3.5'

10
Gemfile.lock
View File

@ -28,7 +28,7 @@ GEM
pygments.rb (0.3.4) pygments.rb (0.3.4)
posix-spawn (~> 0.3.6) posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0) yajl-ruby (~> 1.1.0)
rack (1.4.1) rack (1.4.5)
rack-protection (1.3.2) rack-protection (1.3.2)
rack rack
rake (0.9.2.2) rake (0.9.2.2)
@ -36,9 +36,9 @@ GEM
rdiscount (1.6.8) rdiscount (1.6.8)
rubypants (0.2.0) rubypants (0.2.0)
sass (3.1.20) sass (3.1.20)
sinatra (1.3.3) sinatra (1.3.5)
rack (~> 1.3, >= 1.3.6) rack (~> 1.4)
rack-protection (~> 1.2) rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
stringex (1.4.0) stringex (1.4.0)
syntax (1.0.0) syntax (1.0.0)
@ -60,5 +60,5 @@ DEPENDENCIES
rb-fsevent (~> 0.9) rb-fsevent (~> 0.9)
rdiscount (~> 1.6.8) rdiscount (~> 1.6.8)
rubypants (~> 0.2.0) rubypants (~> 0.2.0)
sinatra (~> 1.3.3) sinatra (~> 1.3.5)
stringex (~> 1.4.0) stringex (~> 1.4.0)