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

Merge remote-tracking branch 'origin/2.2' into 2.3 #4520

Merged
merged 3 commits into from
Jan 21, 2019
Merged

Merge remote-tracking branch 'origin/2.2' into 2.3 #4520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3e4544
Fix potential vulnerability
sbrunner Jan 21, 2019
4b4dd18
Merge pull request #4515 from camptocamp/fix-insecure
sbrunner Jan 21, 2019
2205380
Merge remote-tracking branch 'origin/2.2' into 2.3
sbrunner Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/build/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pyramid_tm==2.2 # geoportal
pytest-cov==2.5.1 # tests
pytest-selenium==1.12.0 # admin tests
python-dateutil==2.6.1 # geoportal, rq.filter: <2.7.0
PyYAML==3.12 # geoportal
PyYAML==3.13 # geoportal
rasterio==1.0a12 # geoportal raster
requests==2.20.1 # geoportal
redis==2.10.6 # geoportal cache
Expand Down
2 changes: 1 addition & 1 deletion travis/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
docker-compose==1.20.1
netifaces==0.10.6
PyYAML==3.12
PyYAML==3.13