From 850c98cbf7073c7396aebf95b17d01ee9de11fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 29 Nov 2014 16:24:50 +0100
Subject: [PATCH] bump sinatra
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 18fc1b69c4..6a017c3fbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
# Background processing
gem 'sidekiq', '3.3.0'
-gem 'sinatra', '1.3.3'
+gem 'sinatra', '1.4.5'
# Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ba7158c8d..3b6b785ee3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -531,10 +531,10 @@ GEM
simple_captcha2 (0.3.2)
rails (>= 4.1)
simple_oauth (0.2.0)
- sinatra (1.3.3)
- rack (~> 1.3, >= 1.3.6)
- rack-protection (~> 1.2)
- tilt (~> 1.3, >= 1.3.3)
+ sinatra (1.4.5)
+ rack (~> 1.4)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
sinon-rails (1.10.3)
railties (>= 3.1)
slop (3.6.0)
@@ -686,7 +686,7 @@ DEPENDENCIES
sidekiq (= 3.3.0)
sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.2)
- sinatra (= 1.3.3)
+ sinatra (= 1.4.5)
sinon-rails (= 1.10.3)
spork (= 1.0.0rc4)
test_after_commit (= 0.4.0)
--
GitLab