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
31c95aa0
Commit
31c95aa0
authored
Jun 28, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add missing attribute to attr_encrypted so it is fully backwards-compatible
parent
c9a46263
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
0 deletions
+3
-0
app/models/ci/variable.rb
app/models/ci/variable.rb
+1
-0
app/models/project_import_data.rb
app/models/project_import_data.rb
+1
-0
app/models/user.rb
app/models/user.rb
+1
-0
No files found.
app/models/ci/variable.rb
View file @
31c95aa0
...
@@ -13,6 +13,7 @@ module Ci
...
@@ -13,6 +13,7 @@ module Ci
attr_encrypted
:value
,
attr_encrypted
:value
,
mode: :per_attribute_iv_and_salt
,
mode: :per_attribute_iv_and_salt
,
insecure_mode:
true
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
algorithm:
'aes-256-cbc'
algorithm:
'aes-256-cbc'
end
end
...
...
app/models/project_import_data.rb
View file @
31c95aa0
...
@@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base
...
@@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base
marshal:
true
,
marshal:
true
,
encode:
true
,
encode:
true
,
mode: :per_attribute_iv_and_salt
,
mode: :per_attribute_iv_and_salt
,
insecure_mode:
true
,
algorithm:
'aes-256-cbc'
algorithm:
'aes-256-cbc'
serialize
:data
,
JSON
serialize
:data
,
JSON
...
...
app/models/user.rb
View file @
31c95aa0
...
@@ -25,6 +25,7 @@ class User < ActiveRecord::Base
...
@@ -25,6 +25,7 @@ class User < ActiveRecord::Base
attr_encrypted
:otp_secret
,
attr_encrypted
:otp_secret
,
key:
Gitlab
::
Application
.
config
.
secret_key_base
,
key:
Gitlab
::
Application
.
config
.
secret_key_base
,
mode: :per_attribute_iv_and_salt
,
mode: :per_attribute_iv_and_salt
,
insecure_mode:
true
,
algorithm:
'aes-256-cbc'
algorithm:
'aes-256-cbc'
devise
:two_factor_authenticatable
,
devise
:two_factor_authenticatable
,
...
...
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