Merge 8aa1df7 into 48924a5

theodi · Aug 29, 2018 · 600ae9d · 600ae9d
2 parents 48924a5 + 8aa1df7
commit 600ae9d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.1
+FROM ruby:2.2.7
 
 RUN bundle config --global frozen 1
 

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
@@ -14,19 +14,6 @@ def home
     end
   end
 
-  def comment
-    @topic = params[:topic]
-    @title = params[:title] || @topic
-    @back  = params[:back]
-
-    # Look for a question with this topic and use the help text
-    @topic_help = begin
-      Question.find(params[:question_id]).help_text
-    rescue ActiveRecord::RecordNotFound
-      ''
-    end
-  end
-
   def discussion
     @topic = 'general'
     @topic_help  = I18n.t 'general', scope: :discussions, default: ''

diff --git a/app/views/main/comment.html.haml b/app/views/main/comment.html.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -123,7 +123,6 @@
   get 'get_badge' => 'certificates#certificate_from_dataset_url'
 
   # comment pages
-  get 'comment' => 'main#comment', as: :comment
   get 'discussion' => 'main#discussion', as: :discussion # general/site-wide
 
   get 'has_js' => 'main#has_js'
@@ -148,7 +147,7 @@
     post 'schedule', to: 'campaigns#schedule', as: 'scheduled_rerun'
     post 'queue_update', to: 'campaigns#queue_update', as: 'queue_update'
   end
-  
+
   # private stats
   get 'status/published_certificates.csv' => 'main#published_certificates'
   get 'status/all_certificates.csv' => 'main#all_certificates'