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

CCDM: Consider folders in the classpath when copying resources (#6246) #6379

Merged
merged 1 commit into from
Sep 3, 2019

Conversation

manolo
Copy link
Member

@manolo manolo commented Sep 2, 2019

Cherry-picked from ccdm branch


This change is Reviewable

@manolo manolo self-assigned this Sep 2, 2019
Copy link
Contributor

@caalador caalador left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 9 of 9 files at r1.
Reviewable status: :shipit: complete! all discussions resolved, 1 of 1 LGTMs obtained (waiting on @denis-anisimov and @pleku)

@caalador caalador merged commit 6f78643 into master Sep 3, 2019
@caalador caalador deleted the mcm/cherrypick-6246 branch September 3, 2019 05:22
@joheriks joheriks added this to the 2.0.10 milestone Sep 3, 2019
joheriks pushed a commit that referenced this pull request Sep 3, 2019
* Check webpack config and build-info depending on compatibility mode (#6343)

Fixes #6233

* Reverse the reversed error message #6290 (#6368)

Shows list of files not found first before listing the directories searched.
At the same time I referenced the constant for RESOURCES_FRONTEND_DEFAULT
instead of hard-coding that path.

Added two new test cases to cover single- and multi-file exception messages.

Fixes #6290

* Consider folders in the classpath when copying resources (#6246) (#6379)

#6306

* Update RoutePrefix to fix Javadoc typo (#6350)

* Update RoutePrefix to fix JavaDoc typo
* Update Route to fix Javadoc typo

* Preserve JavaScript annotations order (#6371)

* Preserve JavaScript annotations order

Fixes #6198

* Improve test code

* Revert method rename and visibility modification to maintain API compatibility
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.

3 participants