diff options
| author | Parker Moore <parkrmoore@gmail.com> | 2013-02-28 12:55:13 -0800 |
|---|---|---|
| committer | Parker Moore <parkrmoore@gmail.com> | 2013-02-28 12:55:13 -0800 |
| commit | f4f42823f687e840c65fdeab0c35d26d442835f7 (patch) | |
| tree | 068cc6cc4593982ab9020103ee06a7902c6bcc0d /Gemfile | |
| parent | 4790b939807be4d9abcc567f02773ff24b99320d (diff) | |
| parent | 960145fa20533174ecd6a6306cf1f235e82650eb (diff) | |
| download | my_new_personal_website-f4f42823f687e840c65fdeab0c35d26d442835f7.tar.xz my_new_personal_website-f4f42823f687e840c65fdeab0c35d26d442835f7.zip | |
Merge pull request #1074 from joneslee85/bump-sinatra
Bump sinatra to 1.3.5
Diffstat (limited to '')
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -15,4 +15,4 @@ group :development do gem 'liquid', '~> 2.3.0' end -gem 'sinatra', '~> 1.3.3' +gem 'sinatra', '~> 1.3.5' diff --git a/Gemfile.lock b/Gemfile.lock index c235b2cb..d5bc6224 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,7 @@ GEM pygments.rb (0.3.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - rack (1.4.1) + rack (1.4.5) rack-protection (1.3.2) rack rake (0.9.2.2) @@ -36,9 +36,9 @@ GEM rdiscount (1.6.8) rubypants (0.2.0) sass (3.1.20) - sinatra (1.3.3) - rack (~> 1.3, >= 1.3.6) - rack-protection (~> 1.2) + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) stringex (1.4.0) syntax (1.0.0) @@ -60,5 +60,5 @@ DEPENDENCIES rb-fsevent (~> 0.9) rdiscount (~> 1.6.8) rubypants (~> 0.2.0) - sinatra (~> 1.3.3) + sinatra (~> 1.3.5) stringex (~> 1.4.0) |