Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/notebook/cells/output/index.vue

@@ -20,12 +20,20 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      outputType: '',
-    };
-  },
   methods: {
+    outputType(output) {
+      if (output.text) {
+        return 'text/plain';
+      } else if (output.data['image/png']) {
+        return 'image/png';
+      } else if (output.data['text/html']) {
+        return 'text/html';
+      } else if (output.data['image/svg+xml']) {
+        return 'image/svg+xml';
+      }
+
+      return 'text/plain';
+    },
     dataForType(output, type) {
       let data = output.data[type];
 
@@ -39,20 +47,13 @@ export default {
       if (output.text) {
         return CodeOutput;
       } else if (output.data['image/png']) {
-        this.outputType = 'image/png';
-
         return ImageOutput;
       } else if (output.data['text/html']) {
-        this.outputType = 'text/html';
-
         return HtmlOutput;
       } else if (output.data['image/svg+xml']) {
-        this.outputType = 'image/svg+xml';
-
         return HtmlOutput;
       }
 
-      this.outputType = 'text/plain';
       return CodeOutput;
     },
     rawCode(output) {
@@ -60,7 +61,7 @@ export default {
         return output.text.join('');
       }
 
-      return this.dataForType(output, this.outputType);
+      return this.dataForType(output, this.outputType(output));
     },
   },
 };
@@ -73,7 +74,7 @@ export default {
       v-for="(output, index) in outputs"
       :key="index"
       type="output"
-      :output-type="outputType"
+      :output-type="outputType(output)"
       :count="count"
       :index="index"
       :raw-code="rawCode(output)"

app/models/clusters/applications/knative.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Knative < ActiveRecord::Base
-      VERSION = '0.2.2'.freeze
+      VERSION = '0.3.0'.freeze
       REPOSITORY = 'https://storage.googleapis.com/triggermesh-charts'.freeze
       METRICS_CONFIG = 'https://storage.googleapis.com/triggermesh-charts/istio-metrics.yaml'.freeze
       FETCH_IP_ADDRESS_DELAY = 30.seconds
@@ -86,7 +86,7 @@ module Clusters
       end
 
       def ingress_service
-        cluster.kubeclient.get_service('knative-ingressgateway', 'istio-system')
+        cluster.kubeclient.get_service('istio-ingressgateway', 'istio-system')
       end
 
       def services_for(ns: namespace)

changelogs/unreleased/59079-fix-jupyter-render-loop.yml

+---
+title: Fix jupyter rendering bug that ended in an infinite loop
+merge_request: 26656
+author: ROSPARS Benoit
+type: fixed

changelogs/unreleased/knative-update.yml

+---
+title: Knative version bump 0.2.2 -> 0.3.0
+merge_request: 26459
+author: Chris Baumbauer
+type: changed

spec/models/clusters/applications/knative_spec.rb

@@ -107,7 +107,7 @@ describe Clusters::Applications::Knative do
     subject { knative.install_command }
 
     it 'should be initialized with latest version' do
-      expect(subject.version).to eq('0.2.2')
+      expect(subject.version).to eq('0.3.0')
     end
 
     it_behaves_like 'a command'