From d1c42c77ba2c3ec318ba75da44208c562b809ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:31:54 +0100
Subject: [PATCH] bump sinatra
---
Gemfile | 2 +-
Gemfile.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 29d1d7745a..3bce5127dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
# Background processing
gem "sidekiq", "3.3.3"
-gem "sinatra", "1.4.5"
+gem "sinatra", "1.4.6"
# Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index 29730f8591..a5a5985bc4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -632,10 +632,10 @@ GEM
simple_captcha2 (0.3.4)
rails (>= 4.1)
simple_oauth (0.2.0)
- sinatra (1.4.5)
+ sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
- tilt (~> 1.3, >= 1.3.4)
+ tilt (>= 1.3, < 3)
sinon-rails (1.10.3)
railties (>= 3.1)
slop (3.6.0)
@@ -805,7 +805,7 @@ DEPENDENCIES
sidekiq (= 3.3.3)
sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4)
- sinatra (= 1.4.5)
+ sinatra (= 1.4.6)
sinon-rails (= 1.10.3)
spring (= 1.3.3)
spring-commands-cucumber (= 1.0.1)
--
GitLab