Use begin/end instead of defined?

2016-02-02 14:35:09 +01:00 · 2016-02-02 14:35:09 +01:00 · 0a4db90d36
parent c76e6b982b
commit 0a4db90d36
1 changed files with 5 additions and 5 deletions
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@ -205,11 +205,11 @@ module Ci
    end

    def ci_yaml_file
-      return @ci_yaml_file if defined?(@ci_yaml_file)
-
-      blob = project.repository.blob_at(sha, '.gitlab-ci.yml')
-      blob.load_all_data!(project.repository)
-      @ci_yaml_file = blob.data
+      @ci_yaml_file ||= begin
+        blob = project.repository.blob_at(sha, '.gitlab-ci.yml')
+        blob.load_all_data!(project.repository)
+        blob.data
+      end
    rescue
      nil
    end