zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 01:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104525318-history_import' into staging

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
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'

2
app/models/legal_document.rb
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

4
config/locales/en.yml
View file

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