Cleanup for mobile build without errors

config/application.rb

@@ -12,35 +12,45 @@ require 'sprockets/railtie'
 # custom override hack for the couchbase-setting gem, needs to be loaded before other gems, is settings only without dependencies
 require File.expand_path('./../../lib/couchbase-setting', __FILE__)
 
+
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
+  Bundler.require(:assets) if ENV['QWAITER_MOBILE_EXPORT']='yes'
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-# Ugly fix for the updated json gem changes
-module JSON
-  class << self
-    alias :old_parse :parse
-    def parse(json, args = {})
-      args[:create_additions] = true
-      old_parse(json, args)
+require 'simply_stored'
+module SimplyStored
+  module Couch
+    def freeze
+      self
+    end
+
+    module ClassMethods
+      def after_commit(*)
+        # Paperclip has ActiveRecord lock, do not use this
+      end
     end
   end
 end
-MultiJson.engine = :json_gem
+
+# Ugly fix for the updated json gem changes
+#module JSON
+  #class << self
+    #alias :old_parse :parse
+    #def parse(json, args = {})
+      #args[:create_additions] = true
+      #old_parse(json, args)
+    #end
+  #end
+#end
+#MultiJson.engine = :json_gem
 
 # This is a fix for testing models that
 # are frozen after destroy and then extended
 # by active_decorator when running the specs
-require 'simply_stored'
-module SimplyStored::Couch
-  def freeze
-    self
-  end
-end
-
 module Qwaiter
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

config/initializers/devise.rb

@@ -48,7 +48,7 @@ Devise.setup do |config|
   # modifying a user and when used to authenticate or find a user. Default is :email.
   config.strip_whitespace_keys = [ :email ]
 
-  config.allow_insecure_sign_in_after_confirmation = true
+  #config.allow_insecure_sign_in_after_confirmation = true
 
   # Tell if authentication through request.params is enabled. True by default.
   # It can be set to an array that will enable params authentication only for the