Merge branch '104525318-history_import' into staging

# Conflicts:
#	Gemfile
#	app/models/domain.rb
#	config/locales/en.yml
This commit is contained in:
Vladimir Krylov 2016-03-04 14:48:41 +02:00
commit fe930c7535
3 changed files with 4 additions and 3 deletions

View file

@ -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 'iso8601', '0.8.6' # for dates and times
gem 'hashie-forbidden_attributes', '0.1.1' gem 'hashie-forbidden_attributes', '0.1.1'
gem 'SyslogLogger', '2.0', require: 'syslog/logger' gem 'SyslogLogger', '2.0', require: 'syslog/logger'
gem 'rest-client'
gem 'parallel' gem 'parallel'
gem 'rest-client' gem 'rest-client'

View file

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