Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also include xray with jQuery3 #84

Merged
merged 5 commits into from
May 4, 2017
Merged

Conversation

kdiogenes
Copy link
Contributor

No description provided.

Copy link
Collaborator

@mattbrictson mattbrictson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! Can you please:

  • address my code comment below
  • add a test to spec/xray/middleware_spec.rb
  • add an entry to the CHANGELOG

I'd appreciate it!

@@ -100,7 +100,7 @@ def script_matcher(script_name)
/
<script[^>]+
\/#{script_name}
(2)? # Optional 2 for jQuery2 format
(2|3)? # Optional 2 for jQuery2 format
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update the comment?

@kdiogenes
Copy link
Contributor Author

Updated!

CHANGELOG.md Outdated
@@ -10,7 +10,8 @@ lesser changes or bug fixes.

## [Unreleased][]

* Your contribution here!
Copy link
Collaborator

@mattbrictson mattbrictson May 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I should have specified. Can you please put the * Your contribution here! back in? Thanks!

@kdiogenes
Copy link
Contributor Author

I think everything is fine now!

@mattbrictson
Copy link
Collaborator

Great, thanks for the contribution! 🙇

@mattbrictson mattbrictson merged commit f559981 into brentd:master May 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants