zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-12 07:34:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'remove-dev-rake-task' into improve-registrant-area

Browse source
This commit is contained in:
Artur Beljajev 2018-06-18 18:05:43 +03:00
commit e564b331ab
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/admin_user.rb
View file

@ -9,7 +9,7 @@ class AdminUser < User
ROLES = %w(user customer_service admin) # should not match to api_users roles ROLES = %w(user customer_service admin) # should not match to api_users roles
devise :rememberable, :validatable, :lockable devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable
def self.min_password_length def self.min_password_length
Devise.password_length.min Devise.password_length.min

2
app/models/user.rb
View file

@ -1,6 +1,6 @@
class User < ActiveRecord::Base class User < ActiveRecord::Base
include Versions # version/user_version.rb include Versions # version/user_version.rb
devise :database_authenticatable, :trackable, :timeoutable devise :trackable, :timeoutable
attr_accessor :phone attr_accessor :phone

3
test/fixtures/users.yml vendored
View file

@ -1,7 +1,6 @@
api_bestnames: api_bestnames:
username: test_bestnames username: test_bestnames
password: testtest password: testtest
encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %>
type: ApiUser type: ApiUser
registrar: bestnames registrar: bestnames
active: true active: true
@ -11,7 +10,6 @@ api_bestnames:
api_goodnames: api_goodnames:
username: test_goodnames username: test_goodnames
password: testtest password: testtest
encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %>
type: ApiUser type: ApiUser
registrar: goodnames registrar: goodnames
active: true active: true
@ -20,7 +18,6 @@ api_goodnames:
admin: admin:
username: test username: test
encrypted_password: <%= Devise::Encryptor.digest(AdminUser, 'testtest') %>
type: AdminUser type: AdminUser
country_code: US country_code: US
roles: roles: