Relax deface version (fixes USN-3235-1)

Gemfile.lock

@@ -16,7 +16,7 @@ PATH
   specs:
     foodsoft_messages (0.0.1)
       base32
-      deface (~> 1.0.0)
+      deface (~> 1.0)
       gserver
       mail
       mini-smtp-server
@@ -121,7 +121,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.7.7)
     commonjs (0.2.7)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
@@ -137,11 +136,11 @@ GEM
     date_time_attribute (0.1.2)
       activesupport (>= 3.0.0)
     debug_inspector (0.0.2)
-    deface (1.0.2)
-      colorize (>= 0.5.8)
-      nokogiri (~> 1.6.0)
+    deface (1.2.0)
+      nokogiri (~> 1.6)
       polyglot
-      rails (>= 3.1)
+      rails (>= 4.1)
+      rainbow (>= 2.1.0)
     diff-lcs (1.2.5)
     diffy (3.1.0)
     docile (1.1.5)
@@ -178,10 +177,10 @@ GEM
     has_scope (0.6.0)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
-    html2haml (2.0.0)
+    html2haml (2.1.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0.0)
-      nokogiri (~> 1.6.0)
+      haml (~> 4.0)
+      nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     htmlentities (4.3.4)
     http-cookie (1.0.3)
@@ -247,7 +246,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (3.1.1)
     netrc (0.11.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.6.1)
     polyamorous (1.3.1)
@@ -314,6 +313,7 @@ GEM
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.1)
     rake (12.0.0)
     ransack (1.8.2)
       actionpack (>= 3.0)
@@ -377,7 +377,7 @@ GEM
     ruby-ole (1.2.12.1)
     ruby-prof (0.15.9)
     ruby-units (2.0.0)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
     rubyzip (1.2.1)
     sass (3.4.23)
@@ -389,7 +389,7 @@ GEM
       tilt (>= 1.1, < 3)
     select2-rails (4.0.3)
       thor (~> 0.14)
-    sexp_processor (4.7.0)
+    sexp_processor (4.8.0)
     simple-navigation (3.14.0)
       activesupport (>= 2.3.2)
     simple-navigation-bootstrap (1.0.2)

plugins/current_orders/foodsoft_current_orders.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md"]
 
   s.add_dependency "rails"
-  s.add_dependency "deface", "~> 1.0.0"
+  s.add_dependency "deface", "~> 1.0"
 end

plugins/documents/foodsoft_documents.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails"
-  s.add_dependency "deface", "~> 1.0.0"
+  s.add_dependency "deface", "~> 1.0"
   s.add_dependency "ruby-filemagic"
 end

plugins/messages/foodsoft_messages.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails"
   s.add_dependency "base32"
-  s.add_dependency "deface", "~> 1.0.0"
+  s.add_dependency "deface", "~> 1.0"
   s.add_dependency "mail"
   s.add_dependency "mini-smtp-server"
   s.add_dependency "gserver"