Commit graph

10997 commits

Author SHA1 Message Date
Tom Hughes
66b5e85845 Merge remote-tracking branch 'upstream/pull/3078' 2021-02-03 14:48:24 +00:00
Tom Hughes
e4c7342450 Merge remote-tracking branch 'upstream/pull/3079' 2021-02-03 14:48:19 +00:00
Andy Allan
5e307c1ceb Merge branch 'pull/2486' 2021-02-03 14:22:16 +00:00
mmd-osm
4e6d729529 Remove /api/0.6/changes endpoint
Also removes sql functions which are only used by this endpoint
2021-02-03 14:06:34 +00:00
Andy Allan
1dc1c03225 Rework welcome message to use bootstrap buttons
I also reworked the layout to use flex utilities and avoid using a white button border as a spacing hack. In future this will be better done with start/end utilities, avoiding the need to be fancy with negative margins.
2021-02-03 13:44:52 +00:00
Andy Allan
05dd681abf Refactor the export form to use bootstrap form controls
I started refatoring the export inputs to use a flex grid instead of
floats, but this is perhaps the one place on the whole site where left/right
makes sense since even in rtl we want min_lon on the left.
2021-02-03 13:44:52 +00:00
Andy Allan
f173895b00 Use small bootstrap buttons for oauth client actions 2021-02-03 13:44:52 +00:00
Andy Allan
e6dcf94577 Use small bootstrap buttons for message inbox and outbox actions 2021-02-03 13:44:52 +00:00
Andy Allan
fd6273cfb8 Refactor user_blocks revoke form to use bootstrap 2021-02-03 13:44:52 +00:00
Andy Allan
b6277bda20 Use bootstrap form styles for update home checkbox
This slipped through the refactoring last week.
2021-02-03 09:39:43 +00:00
Tom Hughes
5912a8011b Update to Omniauth 2.x
This requires converting all use of the /auth endpoints
to use the POST method as GET is no longer supported.
2021-02-02 19:49:03 +00:00
Tom Hughes
cea93e7244 Fix new rubocop warnings 2021-02-02 18:56:29 +00:00
Tom Hughes
6d357c7c73 Update bundle 2021-02-02 18:56:28 +00:00
translatewiki.net
ecab8175f5 Localisation updates from https://translatewiki.net. 2021-02-01 15:32:34 +01:00
Tom Hughes
573369f522 Merge remote-tracking branch 'upstream/pull/3077' 2021-02-01 08:18:42 +00:00
dependabot[bot]
d9f3fcbadc
Bump eslint from 7.18.0 to 7.19.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.18.0 to 7.19.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.18.0...v7.19.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-01 05:10:04 +00:00
Michal Migurski
4fac47a214 Added /home/osm/traces and /home/osm/images to persistent Docker-compose volumes 2021-01-28 12:03:58 -08:00
Michal Migurski
e19e58f059 Create directories for traces and images 2021-01-28 12:03:58 -08:00
Michal Migurski
8c2db90d01 Switched to Docker volumn for DB data 2021-01-28 12:03:58 -08:00
Michal Migurski
033c3b28b3 Added complete Rails test suite
- Added db/functions/functions.sql to docker-compose DB image
- Added `file`, `libgd-dev`, and `unzip` packages to help tests pass
2021-01-28 12:03:58 -08:00
Jamie Alessio
2da3ce6abf Prevent node_modules from mounting to save rake yarn:install step 2021-01-28 12:03:58 -08:00
Michal Migurski
c66041cb71 Made Bootsnap required only when asked-for 2021-01-28 12:03:58 -08:00
Michal Migurski
60f8fb9c93 Applied documentation suggestions from code review
Co-authored-by: Tobias <t@tobiasjordans.de>
2021-01-28 12:03:58 -08:00
Michal Migurski
8baebaba2f Migrated from ruby:2.7 Docker image to ubuntu:20.04 2021-01-28 12:03:58 -08:00
Michal Migurski
1e5cc598bb Extended Docker action to cover full setup and tests 2021-01-28 12:03:58 -08:00
Michal Migurski
810a941e81 Added minimal Docker workflow to test Github Actions 2021-01-28 12:03:58 -08:00
Michal Migurski
bc98021331 Switched tests to "openstreetmap" 2021-01-28 12:03:58 -08:00
Michal Migurski
c936063876 Update INSTALL.md to restore original graf
This reverts commit 20dbf8946351b71fbb4cda69ebdacb1dda2876a6.
2021-01-28 12:03:58 -08:00
Michal Migurski
1ab5e3b39a Noted yarn step in Docker instructions 2021-01-28 12:03:58 -08:00
Michal Migurski
188fc8f1d6 Expanded yarn call to fix test failure 2021-01-28 12:03:58 -08:00
Michal Migurski
b71a6fd5d1 Bumped Ruby version to 2.7 to match CI config 2021-01-28 12:03:58 -08:00
Michal Migurski
c17cb84b46 Replaced raw PGSQL testing file with Osmosis-driven XML file 2021-01-28 12:03:58 -08:00
Michal Migurski
b635cf6bc9 Added API read to docker-compose test 2021-01-28 12:03:58 -08:00
Michal Migurski
f07314ccfe Added new parallel test job for docker-compose 2021-01-28 12:03:58 -08:00
Jamie Alessio
6bcd2144a7 Update INSTALL.md to reference Docker as an option 2021-01-28 12:03:58 -08:00
Jamie Alessio
395300d8f3 Clarifications to Docker instructions 2021-01-28 12:03:58 -08:00
Jamie Alessio
255ce8708a put osmosis installation back 2021-01-28 12:03:58 -08:00
Jamie Alessio
5a431a5cb0 Ignore additional 'large' directories during Docker build step 2021-01-28 12:03:58 -08:00
Jamie Alessio
6624510ed3 Simplify Dockerfile 2021-01-28 12:03:58 -08:00
Jamie Alessio
d5fe598a18 Postgres is no longer starting
Fails with:
db_1   | Error: Database is uninitialized and superuser password is not specified.
db_1   |        You must specify POSTGRES_PASSWORD for the superuser. Use
db_1   |        "-e POSTGRES_PASSWORD=password" to set it in "docker run".
db_1   |
db_1   |        You may also use POSTGRES_HOST_AUTH_METHOD=trust to allow all connections
db_1   |        without a password. This is *not* recommended. See PostgreSQL
db_1   |        documentation about "trust":
db_1   |        https://www.postgresql.org/docs/current/auth-trust.html

Appears to be related to
https://github.com/docker-library/postgres/issues/681
2021-01-28 12:03:58 -08:00
Jamie Alessio
4b4217b8be More DOCKER.md cleanup 2021-01-28 12:03:58 -08:00
Jamie Alessio
db3cbf9803 Docker readme updates 2021-01-28 12:03:58 -08:00
Jamie Alessio
b5bf4e375b Don't try to introduce top-level Makefile at this time 2021-01-28 12:03:58 -08:00
Jamie Alessio
544daa09eb Fix mismatched quote and pluralization 2021-01-28 12:03:58 -08:00
Jamie Alessio
60a18ce78d Update Docker instructions to avoid copying entire settings file 2021-01-28 12:03:58 -08:00
Jamie Alessio
2eb8e76fd3 Add Docker README and Makefile for helper commands 2021-01-28 12:03:58 -08:00
Jamie Alessio
c514fd62fe Introduce docker-compose config for development 2021-01-28 12:03:58 -08:00
Tom Hughes
e6db73f8d3 Avoid password manager autocompletion on user settings page 2021-01-28 11:33:01 +00:00
Tom Hughes
e6dbf56d43 Merge remote-tracking branch 'upstream/pull/3074' 2021-01-28 10:41:06 +00:00
Tom Hughes
f981182731 Merge remote-tracking branch 'upstream/pull/3073' 2021-01-28 10:36:38 +00:00