summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
commiteb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch)
tree71f449ccd6f15422717de3ac24f87d5e888ddd79 /Gemfile
parentdf6e17e48995f25e72509986f30700d778b179b6 (diff)
parent3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff)
Merge branch 'develop'
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 0084033..3ea716c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ gem 'state_machine'
gem 'acts_as_list'
gem 'dalli' # memcached
gem 'inifile'
+gem 'active_model_serializers' # JSON
# Useful Rails 4 stuff
#
@@ -63,6 +64,9 @@ gem "mini_magick"
# Pagination https://github.com/mislav/will_paginate/wiki/Installation
gem 'will_paginate'
+# Pagination for Twitter bootstrap
+gem 'will_paginate-bootstrap'
+
# DelayedJob https://github.com/collectiveidea/delayed_job
gem 'daemons'
gem 'delayed_job_active_record'