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
43d2cd51
Commit
43d2cd51
authored
Sep 08, 2016
by
Diego Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort secret variables by key (fix #20870)
parent
796bdf1d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/models/ci/variable.rb
app/models/ci/variable.rb
+4
-2
app/views/projects/variables/_table.html.haml
app/views/projects/variables/_table.html.haml
+1
-1
No files found.
app/models/ci/variable.rb
View file @
43d2cd51
module
Ci
module
Ci
class
Variable
<
ActiveRecord
::
Base
class
Variable
<
ActiveRecord
::
Base
extend
Ci
::
Model
extend
Ci
::
Model
belongs_to
:project
,
class_name:
'::Project'
,
foreign_key: :gl_project_id
belongs_to
:project
,
class_name:
'::Project'
,
foreign_key: :gl_project_id
validates_uniqueness_of
:key
,
scope: :gl_project_id
validates_uniqueness_of
:key
,
scope: :gl_project_id
...
@@ -11,7 +11,9 @@ module Ci
...
@@ -11,7 +11,9 @@ module Ci
format:
{
with:
/\A[a-zA-Z0-9_]+\z/
,
format:
{
with:
/\A[a-zA-Z0-9_]+\z/
,
message:
"can contain only letters, digits and '_'."
}
message:
"can contain only letters, digits and '_'."
}
attr_encrypted
:value
,
scope
:order_key_asc
,
->
{
reorder
(
key: :asc
)
}
attr_encrypted
:value
,
mode: :per_attribute_iv_and_salt
,
mode: :per_attribute_iv_and_salt
,
insecure_mode:
true
,
insecure_mode:
true
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
...
...
app/views/projects/variables/_table.html.haml
View file @
43d2cd51
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%th
Value
%th
Value
%th
%th
%tbody
%tbody
-
@project
.
variables
.
each
do
|
variable
|
-
@project
.
variables
.
order_key_asc
.
each
do
|
variable
|
-
if
variable
.
id?
-
if
variable
.
id?
%tr
%tr
%td
=
variable
.
key
%td
=
variable
.
key
...
...
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