summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2013-10-06 15:04:40 +0200
committerAlex Legler <alex@a3li.li>2013-10-06 15:04:40 +0200
commitca2737995d7c685246c0bf1e6bc3fc7d365f974f (patch)
treeed6b63b8e736c59bd4cf648161d9e3e851f2dbc7 /Gemfile.lock
parentsearch_controller: Rails 4 fixes (diff)
downloadglsamaker-ca2737995d7c685246c0bf1e6bc3fc7d365f974f.tar.gz
glsamaker-ca2737995d7c685246c0bf1e6bc3fc7d365f974f.tar.bz2
glsamaker-ca2737995d7c685246c0bf1e6bc3fc7d365f974f.zip
Upgrade to thinking-sphinx 3
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock13
1 files changed, 9 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d085560..4b25d72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,7 @@ GEM
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.6.5)
+ innertube (1.1.0)
json (1.8.0)
kramdown (1.2.0)
mail (2.5.4)
@@ -64,6 +65,7 @@ GEM
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2)
+ middleware (0.1.0)
mime-types (1.25)
mini_portile (0.5.1)
minitest (4.7.5)
@@ -137,9 +139,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.5.0)
- thinking-sphinx (2.0.7)
- activerecord (>= 3.0.3)
- riddle (>= 1.3.3)
+ thinking-sphinx (3.0.5)
+ activerecord (>= 3.1.0)
+ builder (>= 2.1.2)
+ innertube (>= 1.0.2)
+ middleware (>= 0.1.0)
+ riddle (>= 1.5.8)
thor (0.18.1)
thread_safe (0.1.3)
atomic
@@ -174,4 +179,4 @@ DEPENDENCIES
simplecov
text-format
thin
- thinking-sphinx (= 2.0.7)
+ thinking-sphinx (~> 3.0.2)