Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f4e209ee
Commit
f4e209ee
authored
Jun 02, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify EE-specific attr_encrypted settings to use the right key
parent
837b6b3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ee/app/models/ee/application_setting.rb
ee/app/models/ee/application_setting.rb
+2
-2
ee/app/models/geo_node.rb
ee/app/models/geo_node.rb
+1
-1
No files found.
ee/app/models/ee/application_setting.rb
View file @
f4e209ee
...
...
@@ -70,13 +70,13 @@ module EE
attr_encrypted
:external_auth_client_key
,
mode: :per_attribute_iv
,
key:
Settings
.
attr_encrypted_db_key_base
,
key:
Settings
.
attr_encrypted_db_key_base
_truncated
,
algorithm:
'aes-256-gcm'
,
encode:
true
attr_encrypted
:external_auth_client_key_pass
,
mode: :per_attribute_iv
,
key:
Settings
.
attr_encrypted_db_key_base
,
key:
Settings
.
attr_encrypted_db_key_base
_truncated
,
algorithm:
'aes-256-gcm'
,
encode:
true
end
...
...
ee/app/models/geo_node.rb
View file @
f4e209ee
...
...
@@ -42,7 +42,7 @@ class GeoNode < ActiveRecord::Base
scope
:with_url_prefix
,
->
(
prefix
)
{
where
(
'url LIKE ?'
,
"
#{
prefix
}
%"
)
}
attr_encrypted
:secret_access_key
,
key:
Settings
.
attr_encrypted_db_key_base
,
key:
Settings
.
attr_encrypted_db_key_base
_truncated
,
algorithm:
'aes-256-gcm'
,
mode: :per_attribute_iv
,
encode:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment