diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-11 12:03:22 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-11 12:03:22 +0000 |
| commit | ef875bd7aa24fd2c68027b8d6c837f33642a606e (patch) | |
| tree | c84c08a24353ec42d1c7c2b44a08a00721edac47 /app | |
| parent | 1569389fa2906ffc611c9af955495c794429d45a (diff) | |
| parent | 470a86670fed96899a342f0b53a047799921055d (diff) | |
| download | gitlab-ce-ef875bd7aa24fd2c68027b8d6c837f33642a606e.tar.gz | |
Merge branch 'fix_deployment_service_predefined_variables' into 'master'
Add missing argument to DeploymentService#predefined_variables
See merge request gitlab-org/gitlab-ce!24989
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/deployment_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/deployment_service.rb b/app/models/project_services/deployment_service.rb index 6dae4f3a4a6..80aa2101509 100644 --- a/app/models/project_services/deployment_service.rb +++ b/app/models/project_services/deployment_service.rb @@ -11,7 +11,7 @@ class DeploymentService < Service %w() end - def predefined_variables + def predefined_variables(project:) [] end |