summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-08 06:57:49 +0000
committerValery Sizov <valery@gitlab.com>2015-06-08 06:57:49 +0000
commit10c1ce31035539e0c87ae6439937ada230285b49 (patch)
treeec22cc9986214acbeb4f6c726aff4561f22f25e7 /app/controllers/projects_controller.rb
parent06f586c8e85d100070745e8453bf9dc1b2528451 (diff)
parentb0d6438548a86084cb4c45d4dd92aeae54d09201 (diff)
downloadgitlab-ci-10c1ce31035539e0c87ae6439937ada230285b49.tar.gz
Merge branch 'variables' into 'master'
Implementation of secret variables https://dev.gitlab.org/gitlab/gitlab-ci/issues/246 @ayufan It will return variables like an array: API call - POST `builds/register` ``` variables:[{"key": "KEY", "value": "VALUE"}] ``` ![joxi_screenshot_1433524410263](https://gitlab.com/gitlab-org/gitlab-ci/uploads/04c2442b939d58c432f7b3fb72a2baa8/joxi_screenshot_1433524410263.png) /cc @dzaporozhets @ayufan See merge request !125
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2ddd1aa..5916df4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -128,6 +128,7 @@ class ProjectsController < ApplicationController
def project_params
params.require(:project).permit(:path, :timeout, :timeout_in_minutes, :default_ref, :always_build,
:polling_interval, :public, :ssh_url_to_repo, :allow_git_fetch, :email_recipients,
- :email_add_pusher, :email_only_broken_builds, :coverage_regex, :shared_runners_enabled, :token)
+ :email_add_pusher, :email_only_broken_builds, :coverage_regex, :shared_runners_enabled, :token,
+ { variables_attributes: [:id, :key, :value, :_destroy] })
end
end