]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 3 Feb 2021 18:07:29 +0000 (18:07 +0000)]
Merge pull request #2409 from jalessio/docker-compose-take2
Add Docker Compose Support for Development Environment
Tom Hughes [Wed, 3 Feb 2021 14:48:24 +0000 (14:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3078'
Tom Hughes [Wed, 3 Feb 2021 14:48:19 +0000 (14:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3079'
Andy Allan [Wed, 3 Feb 2021 14:22:16 +0000 (14:22 +0000)]
Merge branch 'pull/2486'
mmd-osm [Sat, 28 Dec 2019 19:42:08 +0000 (20:42 +0100)]
Remove /api/0.6/changes endpoint
Also removes sql functions which are only used by this endpoint
Andy Allan [Wed, 3 Feb 2021 13:34:59 +0000 (13:34 +0000)]
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.
Andy Allan [Wed, 3 Feb 2021 11:49:27 +0000 (11:49 +0000)]
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.
Andy Allan [Wed, 3 Feb 2021 10:22:05 +0000 (10:22 +0000)]
Use small bootstrap buttons for oauth client actions
Andy Allan [Wed, 3 Feb 2021 10:21:48 +0000 (10:21 +0000)]
Use small bootstrap buttons for message inbox and outbox actions
Andy Allan [Wed, 3 Feb 2021 09:47:52 +0000 (09:47 +0000)]
Refactor user_blocks revoke form to use bootstrap
Andy Allan [Wed, 3 Feb 2021 09:39:43 +0000 (09:39 +0000)]
Use bootstrap form styles for update home checkbox
This slipped through the refactoring last week.
Tom Hughes [Tue, 2 Feb 2021 19:34:05 +0000 (19:34 +0000)]
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.
Tom Hughes [Tue, 2 Feb 2021 18:49:18 +0000 (18:49 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 2 Feb 2021 18:42:57 +0000 (18:42 +0000)]
Update bundle
translatewiki.net [Mon, 1 Feb 2021 14:32:34 +0000 (15:32 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 1 Feb 2021 08:18:42 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/3077'
dependabot[bot] [Mon, 1 Feb 2021 05:10:04 +0000 (05:10 +0000)]
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>
Michal Migurski [Wed, 6 Jan 2021 20:32:42 +0000 (12:32 -0800)]
Added /home/osm/traces and /home/osm/images to persistent Docker-compose volumes
Michal Migurski [Sat, 2 Jan 2021 23:05:47 +0000 (15:05 -0800)]
Create directories for traces and images
Michal Migurski [Wed, 30 Dec 2020 22:51:13 +0000 (14:51 -0800)]
Switched to Docker volumn for DB data
Michal Migurski [Tue, 29 Dec 2020 02:02:33 +0000 (18:02 -0800)]
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
Jamie Alessio [Tue, 29 Dec 2020 18:11:15 +0000 (10:11 -0800)]
Prevent node_modules from mounting to save rake yarn:install step
Michal Migurski [Mon, 28 Dec 2020 19:21:50 +0000 (11:21 -0800)]
Made Bootsnap required only when asked-for
Michal Migurski [Mon, 28 Dec 2020 19:18:15 +0000 (11:18 -0800)]
Applied documentation suggestions from code review
Co-authored-by: Tobias <t@tobiasjordans.de>
Michal Migurski [Fri, 18 Dec 2020 06:45:25 +0000 (22:45 -0800)]
Migrated from ruby:2.7 Docker image to ubuntu:20.04
Michal Migurski [Sun, 20 Dec 2020 18:03:31 +0000 (10:03 -0800)]
Extended Docker action to cover full setup and tests
Michal Migurski [Sun, 20 Dec 2020 17:50:41 +0000 (09:50 -0800)]
Added minimal Docker workflow to test Github Actions
Michal Migurski [Thu, 17 Dec 2020 02:12:05 +0000 (18:12 -0800)]
Switched tests to "openstreetmap"
Michal Migurski [Thu, 17 Dec 2020 02:02:56 +0000 (18:02 -0800)]
Update INSTALL.md to restore original graf
This reverts commit
20dbf8946351b71fbb4cda69ebdacb1dda2876a6 .
Michal Migurski [Sat, 12 Dec 2020 19:55:36 +0000 (11:55 -0800)]
Noted yarn step in Docker instructions
Michal Migurski [Sat, 14 Nov 2020 00:53:02 +0000 (16:53 -0800)]
Expanded yarn call to fix test failure
Michal Migurski [Fri, 13 Nov 2020 22:31:31 +0000 (14:31 -0800)]
Bumped Ruby version to 2.7 to match CI config
Michal Migurski [Sun, 15 Mar 2020 22:40:27 +0000 (15:40 -0700)]
Replaced raw PGSQL testing file with Osmosis-driven XML file
Michal Migurski [Wed, 19 Feb 2020 05:43:32 +0000 (21:43 -0800)]
Added API read to docker-compose test
Michal Migurski [Mon, 17 Feb 2020 07:43:15 +0000 (23:43 -0800)]
Added new parallel test job for docker-compose
Jamie Alessio [Mon, 2 Mar 2020 03:22:19 +0000 (03:22 +0000)]
Update INSTALL.md to reference Docker as an option
Jamie Alessio [Mon, 2 Mar 2020 03:18:25 +0000 (03:18 +0000)]
Clarifications to Docker instructions
Jamie Alessio [Mon, 2 Mar 2020 03:12:22 +0000 (03:12 +0000)]
put osmosis installation back
Jamie Alessio [Mon, 2 Mar 2020 03:03:31 +0000 (03:03 +0000)]
Ignore additional 'large' directories during Docker build step
Jamie Alessio [Mon, 2 Mar 2020 03:02:45 +0000 (03:02 +0000)]
Simplify Dockerfile
Jamie Alessio [Sun, 16 Feb 2020 01:10:45 +0000 (01:10 +0000)]
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
Jamie Alessio [Mon, 28 Oct 2019 01:00:03 +0000 (01:00 +0000)]
More DOCKER.md cleanup
Jamie Alessio [Mon, 28 Oct 2019 00:55:07 +0000 (17:55 -0700)]
Docker readme updates
Jamie Alessio [Sat, 26 Oct 2019 19:13:09 +0000 (12:13 -0700)]
Don't try to introduce top-level Makefile at this time
Jamie Alessio [Thu, 24 Oct 2019 15:04:11 +0000 (08:04 -0700)]
Fix mismatched quote and pluralization
Jamie Alessio [Thu, 24 Oct 2019 15:01:42 +0000 (08:01 -0700)]
Update Docker instructions to avoid copying entire settings file
Jamie Alessio [Tue, 22 Oct 2019 19:48:39 +0000 (19:48 +0000)]
Add Docker README and Makefile for helper commands
Jamie Alessio [Tue, 22 Oct 2019 19:48:02 +0000 (19:48 +0000)]
Introduce docker-compose config for development
Tom Hughes [Thu, 28 Jan 2021 11:33:01 +0000 (11:33 +0000)]
Avoid password manager autocompletion on user settings page
Tom Hughes [Thu, 28 Jan 2021 10:41:06 +0000 (10:41 +0000)]
Merge remote-tracking branch 'upstream/pull/3074'
Tom Hughes [Thu, 28 Jan 2021 10:36:38 +0000 (10:36 +0000)]
Merge remote-tracking branch 'upstream/pull/3073'
Tucker Chapman [Sat, 16 Jan 2021 23:00:57 +0000 (18:00 -0500)]
Remove conditional for polyline layer
When a user searches for a route and one is not found the polyline
layer is removed - if they then change the mode of transportation the
event listener will not reroute if there is no polyline layer.
This commit removes the conditional that prevents the routing code from
re-running after the polyline has been removed.
Fixes #3050
Closes #3055
Andy Allan [Thu, 28 Jan 2021 10:10:38 +0000 (10:10 +0000)]
Provide better descriptions for sr-only labels
Andy Allan [Thu, 28 Jan 2021 10:10:03 +0000 (10:10 +0000)]
Use boolean instead of string for hiding labels
Andy Allan [Wed, 27 Jan 2021 15:36:59 +0000 (15:36 +0000)]
Refactor account form to use bootstrap
There's further refactoring that could be done, but this is sufficient for now.
Andy Allan [Wed, 27 Jan 2021 17:30:17 +0000 (17:30 +0000)]
Convert issue comments to use bootstrap
The reassign checkbox could be simplified in future by changing the expected parameter in the controller
Andy Allan [Wed, 27 Jan 2021 17:04:47 +0000 (17:04 +0000)]
Converge redaction forms to use bootstrap
Andy Allan [Wed, 27 Jan 2021 16:33:11 +0000 (16:33 +0000)]
Convert note form to use bootstrap
Tom Hughes [Wed, 27 Jan 2021 13:48:54 +0000 (13:48 +0000)]
Fix locate control popup on the main map to use new translations
Fixes #3072
Andy Allan [Wed, 27 Jan 2021 12:36:21 +0000 (12:36 +0000)]
Use model attributes and attribute help for the registration fields
The disply name keeps its specific help, since it is different on the account settings page
Tom Hughes [Tue, 26 Jan 2021 22:43:30 +0000 (22:43 +0000)]
Update bundle
translatewiki.net [Mon, 25 Jan 2021 17:13:09 +0000 (18:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 25 Jan 2021 07:06:59 +0000 (07:06 +0000)]
Merge remote-tracking branch 'upstream/pull/3069'
Mikel Maron [Mon, 25 Jan 2021 01:31:21 +0000 (20:31 -0500)]
reserve 60x60 in top right of survey banner
Tom Hughes [Fri, 22 Jan 2021 22:25:41 +0000 (22:25 +0000)]
Merge remote-tracking branch 'upstream/pull/3066'
Mikel Maron [Fri, 22 Jan 2021 19:52:49 +0000 (14:52 -0500)]
community survey banner
Tom Hughes [Thu, 21 Jan 2021 17:15:27 +0000 (17:15 +0000)]
Avoid concatenating text to a translation
Fixes #3064
Tom Hughes [Thu, 21 Jan 2021 17:00:05 +0000 (17:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3065'
translatewiki.net [Thu, 21 Jan 2021 14:17:04 +0000 (15:17 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 21 Jan 2021 11:29:29 +0000 (11:29 +0000)]
Avoid recommending installation of the Ubuntu bundler package
Due to a problem with namespacing and vendoring, the Ubuntu package
leads to namespace conflicts with Thor 1+
Fixes #3013
Tom Hughes [Wed, 20 Jan 2021 15:52:08 +0000 (15:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3063'
Andy Allan [Wed, 20 Jan 2021 13:02:09 +0000 (13:02 +0000)]
Refactor diary comment form to use bootstrap
Andy Allan [Wed, 20 Jan 2021 12:02:41 +0000 (12:02 +0000)]
Refactor user registration form to use bootstrap
Andy Allan [Wed, 20 Jan 2021 11:11:52 +0000 (11:11 +0000)]
Convert to use bootstrap form
Tom Hughes [Tue, 19 Jan 2021 20:17:50 +0000 (20:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3061'
Frederik Ramm [Tue, 19 Jan 2021 19:56:43 +0000 (20:56 +0100)]
Fix a small typo and tests that depend on it.
Tom Hughes [Tue, 19 Jan 2021 18:24:41 +0000 (18:24 +0000)]
Redirect after saving settings in case the username has changed
Fixes #3059
Tom Hughes [Tue, 19 Jan 2021 18:18:42 +0000 (18:18 +0000)]
Update bundle
translatewiki.net [Mon, 18 Jan 2021 15:56:27 +0000 (16:56 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 18 Jan 2021 08:02:24 +0000 (08:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3060'
dependabot[bot] [Mon, 18 Jan 2021 05:01:25 +0000 (05:01 +0000)]
Bump eslint from 7.17.0 to 7.18.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.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.17.0...v7.18.0)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 14 Jan 2021 15:27:17 +0000 (16:27 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Jan 2021 11:11:00 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3049'
Tom Hughes [Thu, 14 Jan 2021 10:52:10 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3048'
Andy Allan [Wed, 13 Jan 2021 17:01:51 +0000 (17:01 +0000)]
Refactor user_blocks form to use bootstrap
Further refactoring could involve a virtual attribute for duration.
dependabot[bot] [Thu, 14 Jan 2021 05:01:14 +0000 (05:01 +0000)]
Bump qs from 6.9.4 to 6.9.6
Bumps [qs](https://github.com/ljharb/qs) from 6.9.4 to 6.9.6.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.4...v6.9.6)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 13 Jan 2021 20:40:48 +0000 (20:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2994'
Tom Hughes [Wed, 13 Jan 2021 20:35:04 +0000 (20:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3046'
Tom Hughes [Wed, 13 Jan 2021 20:31:21 +0000 (20:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3045'
Andy Allan [Wed, 13 Jan 2021 19:20:06 +0000 (19:20 +0000)]
Refactor login form to use bootstrap
Care has been taken to preserve exact tabindexes, field values etc.
Andy Allan [Wed, 13 Jan 2021 14:05:39 +0000 (14:05 +0000)]
Refactor richtext fields to use a custom bootstrap_form input.
This allows us to use form_group_builder and get all the label and
help text handling in line with other bootstrap_form inputs.
Andy Allan [Wed, 13 Jan 2021 10:12:15 +0000 (10:12 +0000)]
Align the richtext help text height with the height of the textarea.
This works by setting the card to the same height as its containing flexbox. For perfect alignment, we need to make sure the extra margin at the bottom of the text-area stops applying when they are shown side by side.
Tom Hughes [Tue, 12 Jan 2021 23:09:51 +0000 (23:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3044'
Mateusz Konieczny [Tue, 12 Jan 2021 21:56:37 +0000 (22:56 +0100)]
rerun script/misc/update-wiki-pages
Tom Hughes [Tue, 12 Jan 2021 22:41:53 +0000 (22:41 +0000)]
Use latest major version for all github actions
Tom Hughes [Mon, 11 Jan 2021 20:04:13 +0000 (20:04 +0000)]
Restore ruby 2.5 compatibility
Tom Hughes [Mon, 11 Jan 2021 19:14:00 +0000 (19:14 +0000)]
Fix new rubocop warnings
Tom Hughes [Mon, 11 Jan 2021 18:48:27 +0000 (18:48 +0000)]
Remove redundant gem requirements for unsupported ruby versions
Tom Hughes [Mon, 11 Jan 2021 18:39:54 +0000 (18:39 +0000)]
Unpin rubocop now erb_lint is fixed
Tom Hughes [Mon, 11 Jan 2021 18:38:11 +0000 (18:38 +0000)]
Update bundle