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

2017-06-08 15:17:45 +06:30
parent 664fe2f6e1 387650656f
commit b57e24c076
2 changed files with 2 additions and 1 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,6 +123,7 @@ GEM
    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)
@@ -258,7 +259,6 @@ DEPENDENCIES
  kaminari!
  listen (~> 3.0.5)
  pg
-  mysql2 (>= 0.3.18, < 0.5)
  prawn
  prawn-table
  puma (~> 3.0)
--- a/db/migrate/20170331024749_create_menu_items.rb
+++ b/db/migrate/20170331024749_create_menu_items.rb
@@ -1,3 +1,4 @@
+
 class CreateMenuItems < ActiveRecord::Migration[5.1]
  def change
    create_table :menu_items do |t|