diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-05-04 03:51:55 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-06 16:33:07 +0900 |
| commit | 9d09fa37ca94291324f1048669e7c1d885be1892 (patch) | |
| tree | 50fbf5ab87569ceb78c172688505d14459f1168c /app/models/ci/build.rb | |
| parent | 6c15905c3bd11209858eac8870ffa9211f08f157 (diff) | |
| download | gitlab-ce-9d09fa37ca94291324f1048669e7c1d885be1892.tar.gz | |
Basic BE change
Fix static-snalysis
Move the precedence of group secure variable before project secure variable. Allow project_id to be null.
Separate Ci::VariableProject and Ci::VariableGroup
Add the forgotton files
Add migration file to update type of ci_variables
Fix form_for fpr VariableProject
Fix test
Change the table structure according to the yorik advice
Add necessary migration files. Remove unnecessary migration spec.
Revert safe_model_attributes.yml
Fix models
Fix spec
Avoid self.variable. Use becomes for correct routing.
Use unique index on group_id and key
Add null: false for t.timestamps
Fix schema version
Diffstat (limited to 'app/models/ci/build.rb')
| -rw-r--r-- | app/models/ci/build.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 2e7a80d308b..d93bba07d8b 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -194,6 +194,7 @@ module Ci variables += project.deployment_variables if has_environment? variables += yaml_variables variables += user_variables + variables += project.group.secret_variables if project&.group.present? variables += project.secret_variables_for(ref).map(&:to_runner_variable) variables += trigger_request.user_variables if trigger_request variables |