From 552a32c01545c82df3790dffa5545a451fd63529 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 2 Mar 2019 15:29:04 +0100
Subject: Extract scoped CI/CD variables to a separate concern

This commits extract code responsible for calculating essential CI/CD
variables to a separate concern. This makes it possible to share this
code between a `Ci::Build` and a `Ci::Bridge`.

We might want to refactor this to use composition instead of
inheritance.
---
 app/models/ci/bridge.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/models/ci/bridge.rb')

diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index f570403615b..0d8d7d95791 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -3,6 +3,7 @@
 module Ci
   class Bridge < CommitStatus
     include Ci::Processable
+    include Ci::Contextable
     include Importable
     include AfterCommitQueue
     include HasRef
@@ -12,6 +13,8 @@ module Ci
     belongs_to :trigger_request
     validates :ref, presence: true
 
+    delegate :merge_request_event?, to: :pipeline
+
     def self.retry(bridge, current_user)
       raise NotImplementedError
     end
@@ -38,11 +41,11 @@ module Ci
       false
     end
 
-    def expanded_environment_name
+    def runnable?
+      false
     end
 
-    def predefined_variables
-      raise NotImplementedError
+    def expanded_environment_name
     end
 
     def execute_hooks
-- 
cgit v1.2.3