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.

Sign up for GitHub

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

Jump to bottom

fixes #6725 #6769

Merged
merged 5 commits into from Aug 12, 2020
Merged

fixes #6725 #6769

merged 5 commits into from Aug 12, 2020

Conversation

tudorilisoi
Copy link
Contributor

@tudorilisoi tudorilisoi commented Jun 22, 2020 •
edited by alexandrebodin

Signed-off-by: Tudor Ilisoi tudorilisoi@yahoo.com

Description of what you did:

merged local plugins config with config/plugins.js

Fix #6769

@tudorilisoi
fixes strapi#6725
cc2f69a 
Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
@alexandrebodin alexandrebodin added source: core:strapi Source is core/strapi package issue: bug Issue reporting a bug labels Aug 5, 2020
alexandrebodin
alexandrebodin requested changes Aug 12, 2020
View reviewed changes
Copy link
Member

@alexandrebodin alexandrebodin left a comment

Choose a reason for hiding this comment

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

A small fix to add :)

@codecov
Copy link

codecov bot commented Aug 12, 2020 •
edited

Codecov Report

Merging #6769 into master will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6769      +/-   ##
==========================================
- Coverage   26.23%   26.21%   -0.02%     
==========================================
  Files        1131     1131              
  Lines       15431    15440       +9     
  Branches     2442     2442              
==========================================
  Hits         4048     4048              
- Misses       9564     9573       +9     
  Partials     1819     1819
Flag Coverage Δ
#front 18.25% <0.00%> (-0.02%) ⬇️
#unit 53.14% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...-manager/admin/src/components/Wysiwyg/constants.js 0.00% <ø> (ø)
...nt-manager/admin/src/components/Wysiwyg/helpers.js 0.00% <0.00%> (ø)
...tent-manager/admin/src/components/Wysiwyg/index.js 0.00% <0.00%> (ø)
...ype-builder/admin/src/containers/ListView/index.js 0.00% <0.00%> (ø)
...iners/HomePage/HomePageContent/HomePageSettings.js 0.00% <ø> (ø)
...n/src/containers/HomePage/HomePageContent/index.js 0.00% <ø> (ø)
...ugin-upload/admin/src/containers/HomePage/index.js 0.00% <0.00%> (ø)
...in-upload/admin/src/containers/HomePage/reducer.js 65.85% <0.00%> (-15.97%) ⬇️
...-upload/admin/src/containers/ModalStepper/index.js 0.00% <0.00%> (ø)
...rapi-plugin-upload/admin/src/translations/index.js 0.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update acf11ed...533353e. Read the comment docs.

@alexandrebodin
Copy link
Member

Sorry @tudorilisoi I can't see any change

@tudorilisoi
Copy link
Contributor Author

@alexandrebodin now it should be fine

@alexandrebodin alexandrebodin added this to the 3.1.4 milestone Aug 12, 2020
alexandrebodin
alexandrebodin approved these changes Aug 12, 2020
View reviewed changes
Copy link
Member

@alexandrebodin alexandrebodin left a comment

Choose a reason for hiding this comment

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

LGTM

@alexandrebodin alexandrebodin merged commit f073aeb into strapi:master Aug 12, 2020
@tudorilisoi tudorilisoi deleted the issue_6725 branch August 13, 2020 09:13
gilfernandes pushed a commit to onepointconsulting/strapi that referenced this pull request Aug 13, 2020
@tudorilisoi @onepointconsulting
fixes strapi#6725 (strapi#6769)
57528d3 
* fixes strapi#6725

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>

* fixed L41

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
Signed-off-by: Gil Fernandes <gil.fernandes@onepointltd.com>
This was referenced Jun 6, 2021
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandrebodin alexandrebodin alexandrebodin approved these changes

@Convly Convly Awaiting requested review from Convly

Assignees
No one assigned
Labels
issue: bug Issue reporting a bug source: core:strapi Source is core/strapi package
Projects
None yet
Milestone
3.1.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tudorilisoi @alexandrebodin