Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty

2017-06-09 02:40:48 +06:30
parent c23f726cb3 75c8936eff
commit 5f5e6470c7
16 changed files with 221 additions and 112 deletions
--- a/3
+++ b/3
@@ -57,7 +57,8 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'

 # Pagination
-gem 'kaminari', '~> 0.16.3' #:git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+gem 'kaminari', '~> 0.16.3'
+

 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development