cms-fortress 1.3.11 → 1.3.12

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 73db0f800362b34e8a830402d1088561e6d77179
4
- data.tar.gz: 34cf552ad384681c74013e5e88a71f61ac0e2331
3
+ metadata.gz: 608e3086c6f0be443c4669157a1a0352a4b23659
4
+ data.tar.gz: b0a47b0364808208f11887667d4f64fda64908d3
5
5
  SHA512:
6
- metadata.gz: 08e8b70757ce6cc9c09aa6eecec68ee0ec3800d63d46e3a3e05fcef1f549666c5ae9c3ad46a36bc96de14cefadb768b720e7c01747acfdc45f993afa397d7f70
7
- data.tar.gz: 49dcab6fbead725b5e5a20e0b7b85d8ae4df03704694decb0332faa4a9fef8c3ad57d07ed4b7e68ca26d4e7b61d1e7076d16dc2a1841c121a3afafe048d61aed
6
+ metadata.gz: 474ad973c1a19d3ce127b5755dbac73a3ff56cc23732c2a6881390207000e99ae19db3fb0e7cb6504aa0c7e4b50de7a658f771811fea9f853a40f824f6720dce
7
+ data.tar.gz: 936b68e255462b964a2bc58b8e3933e2f2a68b33d5615f3aa11df0c9cff7154d774969ea1c98f93acc42025aeae493ddb103b8d816590d64d2fd0e6456376524
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cms-fortress (1.3.11)
4
+ cms-fortress (1.3.12)
5
5
  aasm (~> 4.0)
6
6
  cancancan (~> 1.9)
7
7
  comfortable_mexican_sofa (~> 1.12, >= 1.12.5)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.11
1
+ 1.3.12
@@ -14,7 +14,7 @@ class Cms::Fortress::User < ActiveRecord::Base
14
14
  validates_length_of :password, within: Devise.password_length, allow_blank: true
15
15
  devise :database_authenticatable,
16
16
  :recoverable, :rememberable, :trackable, :timeoutable,
17
- :authentication_keys => [:email, :site_id]
17
+ :authentication_keys => -> {Cms::Fortress.configuration.login_site_selector ? [:email, :site_id] : [:email]}.call
18
18
 
19
19
  belongs_to :role
20
20
  belongs_to :site, class_name: "Comfy::Cms::Site", foreign_key: :site_id
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "cms-fortress"
5
- s.version = "1.3.11"
5
+ s.version = "1.3.12"
6
6
 
7
7
  s.authors = ["Melvin Sembrano"]
8
8
  s.date = "2015-10-10"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cms-fortress
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.11
4
+ version: 1.3.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Melvin Sembrano