pulled master at 4

This commit is contained in:
Yan
2017-06-04 18:29:58 +06:30
71 changed files with 590 additions and 161 deletions

View File

@@ -9,6 +9,7 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record
gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL
@@ -59,6 +60,9 @@ gem 'bcrypt', '~> 3.1.7'
gem 'sidekiq'
# Pagination
gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development