terminal support

4 files changed, 7 insertions, 5 deletions

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index 5c88a9fd543..321f8324866 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -8,9 +8,11 @@ class Projects::DeploymentsController < Projects::ApplicationController
 
   def terminal_websocket_authorize
     Gitlab::Workhorse.verify_api_request!(request.headers)
-    if true # extra access checks, config flags can go here
+    openshift_project = project.variables.find('CI_PROJECT_NAME').to_s
+    openshift_app = project.variables.find('APP').to_s
+    if openshift_project.present? && openshift_app.present?
       set_workhorse_internal_api_content_type
-      render json: {} # Kubernetes namespace/pod/container should go here
+      render json: {openshift_app: openshift_app, openshift_project: openshift_project}
     else
       render text: 'Not found', status: 404
     end
diff --git a/lib/banzai/filter/html_entity_filter.rb b/lib/banzai/filter/html_entity_filter.rb
index 4ef8b3b6dcf..e008fd428b0 100644
--- a/lib/banzai/filter/html_entity_filter.rb
+++ b/lib/banzai/filter/html_entity_filter.rb
@@ -3,7 +3,7 @@ require 'erb'
 module Banzai
   module Filter
     # Text filter that escapes these HTML entities: & " < >
-    class HTMLEntityFilter < HTML::Pipeline::TextFilter
+    class HtmlEntityFilter < HTML::Pipeline::TextFilter
       def call
         ERB::Util.html_escape(text)
       end
diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb
index 30bc035d085..1929099931b 100644
--- a/lib/banzai/pipeline/single_line_pipeline.rb
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
@@ -3,7 +3,7 @@ module Banzai
     class SingleLinePipeline < GfmPipeline
       def self.filters
         @filters ||= FilterArray[
-          Filter::HTMLEntityFilter,
+          Filter::HtmlEntityFilter,
           Filter::SanitizationFilter,
 
           Filter::EmojiFilter,
diff --git a/spec/lib/banzai/filter/html_entity_filter_spec.rb b/spec/lib/banzai/filter/html_entity_filter_spec.rb
index 6dc4a970071..4c68ce6d6e4 100644
--- a/spec/lib/banzai/filter/html_entity_filter_spec.rb
+++ b/spec/lib/banzai/filter/html_entity_filter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Banzai::Filter::HTMLEntityFilter, lib: true do
+describe Banzai::Filter::HtmlEntityFilter, lib: true do
   include FilterSpecHelper
 
   let(:unescaped) { 'foo <strike attr="foo">&&&</strike>' }