Merge branch '104525318-history_import' into staging

# Conflicts:
#	Gemfile
#	app/models/domain.rb
#	config/locales/en.yml

Gemfile

@@ -12,6 +12,7 @@ gem 'rails',        '4.2.5.1' # when update, all initializers eis_custom files n
 gem 'iso8601',      '0.8.6' # for dates and times
 gem 'hashie-forbidden_attributes', '0.1.1'
 gem 'SyslogLogger', '2.0', require: 'syslog/logger'
+gem 'rest-client'
 gem 'parallel'
 gem 'rest-client'
 

app/models/legal_document.rb

@@ -13,7 +13,7 @@ class LegalDocument < ActiveRecord::Base
   validates :body, length: { minimum: (1.37 * 1.4).ceil }, unless: :path
 
   before_create :add_creator
-  before_save   :save_to_filesystem
+  before_save   :save_to_filesystem, if: :body
 
 
 

config/locales/en.yml

@@ -538,7 +538,7 @@ en:
   admin_menu: Admin
   domain_transfer_was_approved: 'Domain transfer was approved, associated contacts were: %{contacts} and registrant was %{registrant}'
   business_registry_service_not_available: "Business Registry service Ärireg is not available"
-  
+
   # DEPP
   activemodel:
     errors:
@@ -935,7 +935,7 @@ en:
   add_reserved_domain: 'Add domain to reserved list'
   add_blocked_domain: 'Add domain to blocked list'
   edit_pw: 'Edit Pw'
-  optional: 'Optional'  
+  optional: 'Optional'
   contact_already_associated_with_the_domain: 'Object association prohibits operation, contact already associated with the domain'
   personal_domain_verification_url: 'Personal domain verification url'
   available_verification_url_not_found: 'Available verification url not found, for domain.'