Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       # check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 

config/puma.rb

@@ -1,10 +1,10 @@
-#application_path="#{File.expand_path("../..", __FILE__)}"
-#directory application_path
-#environment ENV.fetch("RAILS_ENV") { "production" }
-#environment "production"
-#pidfile "#{application_path}/tmp/puma/pid"
-#state_path "#{application_path}/tmp/puma/state"
-#stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-#port        ENV.fetch("PORT") { 62158 }
-#workers 2
-#preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+# environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port        ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!