Merge branch 'master' of bitbucket.org:signum/debshots

This commit is contained in:
Haas, Christoph 2013-11-20 16:33:17 +01:00
commit ba4c4597bb
2 changed files with 14 additions and 0 deletions

View file

@ -67,3 +67,12 @@ gem 'kaminari'
# Lightbox image viewer for full-sized images
gem 'fancybox2-rails', '~> 0.2.4'
# Full-text search… texticle is nowadays called textacular… and it's very inflexible
#gem 'textacular', require: 'textacular/rails'
# Trying pg_search for full-text search… too slow with ranking… screw PostgreSQL
#gem 'pg_search'
# Let's use Elasticsearch
gem 'tire'

View file

@ -79,6 +79,10 @@ GEM
minitest (4.7.5)
multi_json (1.8.2)
pg (0.17.0)
pg_search (0.7.0)
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
polyglot (0.3.3)
rack (1.5.2)
rack-contrib (1.1.0)
@ -149,6 +153,7 @@ DEPENDENCIES
kaminari
meta_request
pg
pg_search
rails (= 4.0.0)
sass-rails (~> 4.0.0)
sdoc