pull master
This commit is contained in:
3
Gemfile
3
Gemfile
@@ -15,9 +15,6 @@ gem 'mysql2', '>= 0.3.18', '< 0.5'
|
|||||||
# redis server for cable
|
# redis server for cable
|
||||||
gem 'redis', '~> 3.0'
|
gem 'redis', '~> 3.0'
|
||||||
|
|
||||||
#gem pg for
|
|
||||||
gem 'pg'
|
|
||||||
|
|
||||||
# Use Puma as the app server
|
# Use Puma as the app server
|
||||||
gem 'puma', '~> 3.0'
|
gem 'puma', '~> 3.0'
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
|
|||||||
@@ -233,6 +233,7 @@ DEPENDENCIES
|
|||||||
jbuilder (~> 2.5)
|
jbuilder (~> 2.5)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
listen (~> 3.0.5)
|
listen (~> 3.0.5)
|
||||||
|
mysql2 (>= 0.3.18, < 0.5)
|
||||||
pg
|
pg
|
||||||
prawn
|
prawn
|
||||||
prawn-table
|
prawn-table
|
||||||
|
|||||||
Reference in New Issue
Block a user