diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-08-16 19:54:05 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-09-03 17:49:10 +0300 |
| commit | e1ef436d1fd6419ce8a08c4ac33bf664786c80b0 (patch) | |
| tree | dddd090cb598449df56a24204a40596d88b25fa4 /app/services/ci | |
| parent | 0a7b3ae9f1a67645c798dfbfc60388c4c9cb5b95 (diff) | |
Update application code by the db schema change
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 7 | ||||
| -rw-r--r-- | app/services/ci/register_job_service.rb | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 4b141047bce..de2cd7e87be 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -12,8 +12,7 @@ module Ci tag: tag?, trigger_requests: Array(trigger_request), user: current_user, - pipeline_schedule: schedule, - protected: protected? + pipeline_schedule: schedule ) result = validate(current_user, @@ -176,10 +175,6 @@ module Ci origin_sha && origin_sha != Gitlab::Git::BLANK_SHA end - def protected? - project.protected_for?(ref) - end - def error(message, save: false) pipeline.tap do pipeline.errors.add(:base, message) diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index a51c28808dd..1f243de5761 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -78,7 +78,7 @@ module Ci def new_builds builds = Ci::Build.pending.unstarted - builds = builds.on_protected if runner.protected? + builds = builds.protected_ if runner.protected_? builds end |