From 950ef3debfb8f7cbf42b8f132d3f9cc18ab5af99 Mon Sep 17 00:00:00 2001
From: Jane Sternbach <janester@github.com>
Date: Wed, 6 May 2020 22:53:46 -0400
Subject: [PATCH 1/2] enable filtering events to just the ones we care about

---
 .../app/controllers/webhooks_controller.rb    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/changelogger/app/controllers/webhooks_controller.rb b/changelogger/app/controllers/webhooks_controller.rb
index 872aa422..c6ed6cf5 100644
--- a/changelogger/app/controllers/webhooks_controller.rb
+++ b/changelogger/app/controllers/webhooks_controller.rb
@@ -2,12 +2,12 @@ class WebhooksController < ApplicationController
   WEBHOOK_HEADERS = ["HTTP_USER_AGENT", "CONTENT_TYPE", "HTTP_X_GITHUB_EVENT", "HTTP_X_GITHUB_DELIVERY", "HTTP_X_HUB_SIGNATURE"]
 
 #  before_action :verify_signature!
-#  before_action :verify_event_type!
+  before_action :verify_event_type!
 
   def create
-#    return error("not labeled") unless labeled?
-#    return error("not closed") unless closed?
-#    return error("not merged") unless merged_into_master?
+    return error("not labeled") unless labeled?
+    return error("not closed") unless closed?
+    return error("not merged") unless merged_into_master?
 
 #    create_changelog_entry
 
@@ -29,28 +29,28 @@ def error(msg)
     render(status: 422, json: text)
   end
 
-#  def verify_event_type!
-#    type = request.headers["HTTP_X_GITHUB_EVENT"]
-#    return if type == "pull_request"
-#    error("unallowed event type: #{type}")
-#  end
+  def verify_event_type!
+    type = request.headers["HTTP_X_GITHUB_EVENT"]
+    return if type == "pull_request"
+    error("unallowed event type: #{type}")
+  end
 
-#  def labeled?
-#    payload["pull_request"]["labels"].any? do |label|
-#      label["name"] == "documentation"
-#    end
-#  end
+  def labeled?
+    payload["pull_request"]["labels"].any? do |label|
+      label["name"] == "documentation"
+    end
+  end
 
-#  def closed?
-#    payload["action"] == "closed"
-#  end
+  def closed?
+    payload["action"] == "closed"
+  end
 
-#  def merged_into_master?
-#    merged = payload["pull_request"]["merged"] == true
-#    in_to_master = payload["pull_request"]["base"]["ref"] == "master"
+  def merged_into_master?
+    merged = payload["pull_request"]["merged"] == true
+    in_to_master = payload["pull_request"]["base"]["ref"] == "master"
 
-#    merged && in_to_master
-#  end
+    merged && in_to_master
+  end
 
 #  def octokit
 #    Octokit::Client.new(access_token: ENV["GITHUB_PERSONAL_ACCESS_TOKEN"])

From 468ad5dc945172c4e10551f9f769643f44f764bc Mon Sep 17 00:00:00 2001
From: Jane Sternbach <janester@github.com>
Date: Wed, 6 May 2020 22:54:31 -0400
Subject: [PATCH 2/2] enable octokit client

---
 changelogger/app/controllers/webhooks_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/changelogger/app/controllers/webhooks_controller.rb b/changelogger/app/controllers/webhooks_controller.rb
index c6ed6cf5..204d61fd 100644
--- a/changelogger/app/controllers/webhooks_controller.rb
+++ b/changelogger/app/controllers/webhooks_controller.rb
@@ -52,9 +52,9 @@ def merged_into_master?
     merged && in_to_master
   end
 
-#  def octokit
-#    Octokit::Client.new(access_token: ENV["GITHUB_PERSONAL_ACCESS_TOKEN"])
-#  end
+  def octokit
+    Octokit::Client.new(access_token: ENV["GITHUB_PERSONAL_ACCESS_TOKEN"])
+  end
 
 #  def create_changelog_entry
 #    content, sha = get_file