fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/8
+++ b/8
@@ -1,6 +1,9 @@
 source 'https://rubygems.org'

-# ruby '2.4.1'
+
+#ruby '2.5.0'
+#ruby '2.5.7'
+

 git_source(:github) do |repo_name|
  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -40,6 +43,9 @@ gem 'material_icons'
 gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'rack-cors'

+# Multi-tenancy for shops
+gem 'acts_as_tenant'
+
 # image upload
 gem 'carrierwave', '~> 1.0'
 gem 'mini_magick'