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

2017-08-21 17:40:44 +06:30
parent e9ba56826c 9d424df9fd
commit e3c1dd216a
224 changed files with 5530 additions and 933 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,6 +51,10 @@ GEM
    builder (3.2.3)
    byebug (9.0.6)
    cancancan (1.17.0)
+    carrierwave (1.1.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
    chronic (0.10.2)
    coffee-rails (4.2.2)
      coffee-script (>= 2.2.0)
@@ -251,6 +255,7 @@ DEPENDENCIES
  bootstrap-datepicker-rails
  byebug
  cancancan (~> 1.10)
+  carrierwave (~> 1.0)
  coffee-rails (~> 4.2)
  cups (~> 0.0.7)
  database_cleaner