diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-18 08:15:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-18 08:15:02 +0000 |
| commit | e27aa43d7a57c841f7a56ab93aa2c6821f45d183 (patch) | |
| tree | 51ed96510315853ee75702ab351f8eef04241994 | |
| parent | 9a5765bfde2c49e5618a41f18ea8decb6d778bbc (diff) | |
| parent | 18c2b062682625a34cf169a60d6d997280f9fdc1 (diff) | |
| download | gitlab-ce-e27aa43d7a57c841f7a56ab93aa2c6821f45d183.tar.gz | |
Merge branch 'blackst0ne-rails5-fix-gitlab-ci-trace-stream-delegate-valid' into 'master'
[Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`
See merge request gitlab-org/gitlab-ce!18270
| -rw-r--r-- | lib/gitlab/ci/trace/stream.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb index 54894a46077..8f7600f60c6 100644 --- a/lib/gitlab/ci/trace/stream.rb +++ b/lib/gitlab/ci/trace/stream.rb @@ -10,7 +10,9 @@ module Gitlab delegate :close, :tell, :seek, :size, :url, :truncate, to: :stream, allow_nil: true - delegate :valid?, to: :stream, as: :present?, allow_nil: true + delegate :valid?, to: :stream, allow_nil: true + + alias_method :present?, :valid? def initialize @stream = yield |