govuk_content_models 6.0.6 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +4 -0
- data/app/models/user.rb +1 -6
- data/govuk_content_models.gemspec +1 -1
- data/lib/govuk_content_models/version.rb +1 -1
- metadata +9 -8
data/CHANGELOG.md
ADDED
data/app/models/user.rb
CHANGED
|
@@ -22,6 +22,7 @@ class User
|
|
|
22
22
|
field "email", type: String
|
|
23
23
|
field "permissions", type: Array
|
|
24
24
|
field "remotely_signed_out", type: Boolean, default: false
|
|
25
|
+
field "organisation_slug", type: String
|
|
25
26
|
|
|
26
27
|
GOVSPEAK_FIELDS = []
|
|
27
28
|
|
|
@@ -33,12 +34,6 @@ class User
|
|
|
33
34
|
|
|
34
35
|
validates_with SafeHtml
|
|
35
36
|
|
|
36
|
-
# GDS::SSO specifically looks for find_by_uid within warden
|
|
37
|
-
# when loading authentication user from session
|
|
38
|
-
def self.find_by_uid(uid)
|
|
39
|
-
where(uid: uid).first
|
|
40
|
-
end
|
|
41
|
-
|
|
42
37
|
def to_s
|
|
43
38
|
name || email || ""
|
|
44
39
|
end
|
|
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
|
|
|
19
19
|
gem.add_dependency "differ"
|
|
20
20
|
gem.add_dependency "gds-api-adapters"
|
|
21
21
|
|
|
22
|
-
gem.add_dependency "gds-sso", ">=
|
|
22
|
+
gem.add_dependency "gds-sso", ">= 7.0.0", "< 10.0.0"
|
|
23
23
|
gem.add_dependency "govspeak", ">= 1.0.1", "< 2.0.0"
|
|
24
24
|
# Mongoid 2.5.0 supports the newer 1.7.x and 1.8.x Mongo drivers
|
|
25
25
|
gem.add_dependency "mongoid", "~> 2.5"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_content_models
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.0
|
|
4
|
+
version: 6.1.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-01-
|
|
12
|
+
date: 2014-01-29 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bson_ext
|
|
@@ -66,10 +66,10 @@ dependencies:
|
|
|
66
66
|
requirements:
|
|
67
67
|
- - ! '>='
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version:
|
|
69
|
+
version: 7.0.0
|
|
70
70
|
- - <
|
|
71
71
|
- !ruby/object:Gem::Version
|
|
72
|
-
version:
|
|
72
|
+
version: 10.0.0
|
|
73
73
|
type: :runtime
|
|
74
74
|
prerelease: false
|
|
75
75
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -77,10 +77,10 @@ dependencies:
|
|
|
77
77
|
requirements:
|
|
78
78
|
- - ! '>='
|
|
79
79
|
- !ruby/object:Gem::Version
|
|
80
|
-
version:
|
|
80
|
+
version: 7.0.0
|
|
81
81
|
- - <
|
|
82
82
|
- !ruby/object:Gem::Version
|
|
83
|
-
version:
|
|
83
|
+
version: 10.0.0
|
|
84
84
|
- !ruby/object:Gem::Dependency
|
|
85
85
|
name: govspeak
|
|
86
86
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -337,6 +337,7 @@ files:
|
|
|
337
337
|
- .gitignore
|
|
338
338
|
- .ruby-version
|
|
339
339
|
- .travis.yml
|
|
340
|
+
- CHANGELOG.md
|
|
340
341
|
- CONTRIBUTING.md
|
|
341
342
|
- Gemfile
|
|
342
343
|
- LICENSE
|
|
@@ -453,7 +454,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
453
454
|
version: '0'
|
|
454
455
|
segments:
|
|
455
456
|
- 0
|
|
456
|
-
hash:
|
|
457
|
+
hash: -3811890245827365006
|
|
457
458
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
458
459
|
none: false
|
|
459
460
|
requirements:
|
|
@@ -462,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
462
463
|
version: '0'
|
|
463
464
|
segments:
|
|
464
465
|
- 0
|
|
465
|
-
hash:
|
|
466
|
+
hash: -3811890245827365006
|
|
466
467
|
requirements: []
|
|
467
468
|
rubyforge_project:
|
|
468
469
|
rubygems_version: 1.8.23
|