For pull

2017-06-07 18:11:03 +06:30
parent 5264f9cf14 4323da6589
commit e2ecfaeaad
40 changed files with 463 additions and 183 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,11 +117,11 @@ GEM
    minitest (5.10.2)
    multi_json (1.12.1)
    multi_xml (0.6.0)
-    mysql2 (0.4.6)
    nio4r (2.1.0)
    nokogiri (1.7.2)
      mini_portile2 (~> 2.1.0)
    pdf-core (0.7.0)
+    pg (0.20.0)
    prawn (2.2.2)
      pdf-core (~> 0.7.0)
      ttfunk (~> 1.5)
@@ -255,7 +255,7 @@ DEPENDENCIES
  jquery-rails
  kaminari!
  listen (~> 3.0.5)
-  mysql2 (>= 0.3.18, < 0.5)
+  pg
  prawn
  prawn-table
  puma (~> 3.0)