Merge branch 'master' into ce-to-ee-2018-05-30

4d3ddb7b · Stan Hu · b625aade · aa49e6c9 · 4d3ddb7b · 4d3ddb7b
Commit 4d3ddb7b authored May 30, 2018 by Stan Hu
Showing with 2 additions and 2 deletions

ee/app/workers/create_github_webhook_worker.rb ee/app/workers/create_github_webhook_worker.rb +1 -1

ee/spec/workers/create_github_webhook_worker_spec.rb ee/spec/workers/create_github_webhook_worker_spec.rb +1 -1

No files found.
--- a/ee/app/workers/create_github_webhook_worker.rb
+++ b/ee/app/workers/create_github_webhook_worker.rb
 class CreateGithubWebhookWorker
  include ApplicationWorker
-  include GrapeRouteHelpers::NamedRouteMatcher
+  include GrapePathHelpers::NamedRouteMatcher

  attr_reader :project


--- a/ee/spec/workers/create_github_webhook_worker_spec.rb
+++ b/ee/spec/workers/create_github_webhook_worker_spec.rb
 require 'spec_helper'

 describe CreateGithubWebhookWorker do
-  include GrapeRouteHelpers::NamedRouteMatcher
+  include GrapePathHelpers::NamedRouteMatcher

  let(:project) do
    create(:project,