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

[Fixes #5504] Map Thumbnails Broken #5505

Merged
merged 1 commit into from
Jan 14, 2020
Merged

[Fixes #5504] Map Thumbnails Broken #5505

merged 1 commit into from
Jan 14, 2020

Conversation

afabiani
Copy link
Member

@afabiani afabiani commented Jan 14, 2020

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemptions is, changes not visible to end users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there are explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@afabiani afabiani added this to the 2.10.2 milestone Jan 14, 2020
@afabiani afabiani self-assigned this Jan 14, 2020
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Jan 14, 2020
@codecov
Copy link

codecov bot commented Jan 14, 2020

Codecov Report

Merging #5505 into master will decrease coverage by 0.05%.
The diff coverage is 57.69%.

@@            Coverage Diff            @@
##           master   #5505      +/-   ##
=========================================
- Coverage   58.95%   58.9%   -0.06%     
=========================================
  Files         167     167              
  Lines       19256   19284      +28     
  Branches     3001    3005       +4     
=========================================
+ Hits        11353   11359       +6     
- Misses       6901    6922      +21     
- Partials     1002    1003       +1

@afabiani afabiani merged commit 8d03339 into master Jan 14, 2020
@afabiani afabiani deleted the ISSUE_5504 branch January 14, 2020 12:13
@github-actions
Copy link
Contributor

The backport to 2.10.x failed:

The process 'git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.10.x 2.10.x
# Navigate to the new working tree
cd .worktrees/backport-2.10.x
# Create a new branch
git switch --create backport-5505-to-2.10.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 8d033398d76fad2111fbe68a4cc5ce012d745ee0
# Push it to GitHub
git push --set-upstream origin backport-5505-to-2.10.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.10.x

Then, create a pull request where the base branch is 2.10.x and the compare/head branch is backport-5505-to-2.10.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Map Thumbnails Broken
1 participant