Merge branch 'ci-commit-as-pipeline' into with-pipeline-view

app/models/ci/commit.rb

@@ -138,7 +138,10 @@ module Ci
 
     def config_processor
       return nil unless ci_yaml_file
-      @config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.path_with_namespace)
+      return @config_processor if defined?(@config_processor)
+
+      @config_processor ||= begin
+        Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.path_with_namespace)
       rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
         save_yaml_error(e.message)
         nil
@@ -146,17 +149,19 @@ module Ci
         save_yaml_error("Undefined error")
         nil
       end
+    end
 
     def ci_yaml_file
-      return nil if defined?(@ci_yaml_file)
+      return @ci_yaml_file if defined?(@ci_yaml_file)
+
       @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
+    end
 
     def skip_ci?
       git_commit_message =~ /(\[ci skip\])/ if git_commit_message