diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-07-04 05:20:44 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-07-04 16:02:30 +0800 |
| commit | 005870d5ce1a00b3405d0ae3a639d0c4befcb7a2 (patch) | |
| tree | 69fbec62f3e8392dc9e273c68488a1814033aec2 /app/policies/ci | |
| parent | 39573c6dde39de2345f100586c2c10f74187f6c1 (diff) | |
| download | gitlab-ce-005870d5ce1a00b3405d0ae3a639d0c4befcb7a2.tar.gz | |
Fix bad conflict resolution
Diffstat (limited to 'app/policies/ci')
| -rw-r--r-- | app/policies/ci/pipeline_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/ci/pipeline_policy.rb b/app/policies/ci/pipeline_policy.rb index 73b5a40c7fc..8dba28b8d97 100644 --- a/app/policies/ci/pipeline_policy.rb +++ b/app/policies/ci/pipeline_policy.rb @@ -1,6 +1,6 @@ module Ci class PipelinePolicy < BasePolicy - delegate { pipeline.project } + delegate { @subject.project } condition(:user_cannot_update) do !::Gitlab::UserAccess |