]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Mar 2021 13:50:53 +0000 (14:50 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Feb 2021 15:25:29 +0000 (16:25 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3109'
Tom Hughes [Wed, 24 Feb 2021 17:12:36 +0000 (17:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3109'

3 years agoRemove standard-form CSS rules
Andy Allan [Wed, 24 Feb 2021 14:48:10 +0000 (14:48 +0000)]
Remove standard-form CSS rules

3 years agoConvert the search forms to bootstrap
Andy Allan [Wed, 10 Feb 2021 14:17:58 +0000 (14:17 +0000)]
Convert the search forms to bootstrap

This moves the forms to a flex grid, albeit with a little twiddling
to get things working in a compact space.

3 years agoMerge branch 'pull/3091'
Andy Allan [Wed, 24 Feb 2021 10:49:39 +0000 (10:49 +0000)]
Merge branch 'pull/3091'

3 years agoUse the bootstrap spacer variable as the basis for spacing calcuation, and match...
Andy Allan [Wed, 24 Feb 2021 10:35:28 +0000 (10:35 +0000)]
Use the bootstrap spacer variable as the basis for spacing calcuation, and match mb-1 definition

3 years agoUpdate bundle
Tom Hughes [Tue, 23 Feb 2021 18:56:55 +0000 (18:56 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Feb 2021 15:49:08 +0000 (16:49 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoTighten up cookie security
Tom Hughes [Fri, 19 Feb 2021 18:18:13 +0000 (18:18 +0000)]
Tighten up cookie security

Mark all cookies as Secure, and the cookies which are not
modified client side as HttpOnly.

3 years agoAdd btn-wrapper class
mxdanger [Thu, 18 Feb 2021 02:27:41 +0000 (18:27 -0800)]
Add btn-wrapper class

3 years agoMerge remote-tracking branch 'upstream/pull/3102'
Tom Hughes [Wed, 17 Feb 2021 18:55:55 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3102'

3 years agoRefactor the share panel to use bootstrap forms
Andy Allan [Wed, 17 Feb 2021 17:17:19 +0000 (17:17 +0000)]
Refactor the share panel to use bootstrap forms

3 years agoUse bootstrap form-check for overlay selection
Andy Allan [Wed, 17 Feb 2021 17:05:49 +0000 (17:05 +0000)]
Use bootstrap form-check for overlay selection

3 years agoMerge remote-tracking branch 'upstream/pull/3100'
Tom Hughes [Wed, 17 Feb 2021 11:56:53 +0000 (11:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3100'

3 years agoBump composite_primary_keys to 12.0.8
Andy Allan [Wed, 17 Feb 2021 11:12:47 +0000 (11:12 +0000)]
Bump composite_primary_keys to 12.0.8

12.0.7 has been yanked

3 years agoMerge pull request #3083 from migurski/migurski/docker-compose-cleanups
Andy Allan [Wed, 17 Feb 2021 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3083 from migurski/migurski/docker-compose-cleanups

Post-merge Docker Compose cleanup issues

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 16 Feb 2021 21:14:54 +0000 (21:14 +0000)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 16 Feb 2021 21:10:28 +0000 (21:10 +0000)]
Update bundle

3 years agoValidate avatar images
Tom Hughes [Tue, 16 Feb 2021 17:37:18 +0000 (17:37 +0000)]
Validate avatar images

Closes #3097

3 years agoFix avatar mode update on file change
Tom Hughes [Tue, 16 Feb 2021 17:12:34 +0000 (17:12 +0000)]
Fix avatar mode update on file change

3 years agoMerge remote-tracking branch 'upstream/pull/3095'
Tom Hughes [Tue, 16 Feb 2021 08:10:49 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3095'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Feb 2021 13:52:55 +0000 (14:52 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.19.0 to 7.20.0
dependabot[bot] [Mon, 15 Feb 2021 05:01:20 +0000 (05:01 +0000)]
Bump eslint from 7.19.0 to 7.20.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.19.0 to 7.20.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.19.0...v7.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoRemoved ENABLE_BOOTSNAP environment variable
Michal Migurski [Thu, 4 Feb 2021 19:27:10 +0000 (11:27 -0800)]
Removed ENABLE_BOOTSNAP environment variable

3 years agoAdded explanatory notes and comments
Michal Migurski [Thu, 4 Feb 2021 16:24:41 +0000 (08:24 -0800)]
Added explanatory notes and comments

3 years agoAdded note about password and privileges for OSM DB user
Michal Migurski [Thu, 4 Feb 2021 04:37:06 +0000 (20:37 -0800)]
Added note about password and privileges for OSM DB user

3 years agoMoved osm-db-functions.sql to /usr/local/share/
Michal Migurski [Thu, 4 Feb 2021 04:35:16 +0000 (20:35 -0800)]
Moved osm-db-functions.sql to /usr/local/share/

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Feb 2021 17:59:09 +0000 (18:59 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate to rails 6.0.3.5
Tom Hughes [Wed, 10 Feb 2021 22:42:39 +0000 (22:42 +0000)]
Update to rails 6.0.3.5

3 years agoPrevent CSRF bypass with login form
Tom Hughes [Wed, 10 Feb 2021 19:37:51 +0000 (19:37 +0000)]
Prevent CSRF bypass with login form

3 years agoRefactor the third-party login form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 15:39:55 +0000 (15:39 +0000)]
Refactor the third-party login form to use bootstrap

3 years agoUpdate terms form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 15:09:29 +0000 (15:09 +0000)]
Update terms form to use bootstrap

3 years agoConvert the new note form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 14:23:11 +0000 (14:23 +0000)]
Convert the new note form to use bootstrap

3 years agoRework changeset comments form to use bootstrap styling
Andy Allan [Wed, 10 Feb 2021 10:55:41 +0000 (10:55 +0000)]
Rework changeset comments form to use bootstrap styling

3 years agoPrevent CSRF bypass with password reset form
Tom Hughes [Tue, 9 Feb 2021 22:59:54 +0000 (22:59 +0000)]
Prevent CSRF bypass with password reset form

3 years agoPrevent CSRF bypass unblocking users
mmd-osm [Tue, 9 Feb 2021 18:46:17 +0000 (19:46 +0100)]
Prevent CSRF bypass unblocking users

3 years agoFix unexpected spacing on note buttons when overflowed
mxdanger [Tue, 9 Feb 2021 01:32:29 +0000 (17:32 -0800)]
Fix unexpected spacing on note buttons when overflowed

3 years agoPrevent CSRF bypass updating account details
Tom Hughes [Mon, 8 Feb 2021 12:24:43 +0000 (12:24 +0000)]
Prevent CSRF bypass updating account details

Fixes #3089

3 years agoMerge remote-tracking branch 'upstream/pull/3088'
Tom Hughes [Mon, 8 Feb 2021 08:09:31 +0000 (08:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3088'

3 years agoMerge remote-tracking branch 'upstream/pull/3087'
Tom Hughes [Mon, 8 Feb 2021 08:09:27 +0000 (08:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3087'

3 years agoUpdate actions/cache requirement to v2.1.4
dependabot[bot] [Mon, 8 Feb 2021 07:38:32 +0000 (07:38 +0000)]
Update actions/cache requirement to v2.1.4

Updates the requirements on [actions/cache](https://github.com/actions/cache) to permit the latest version.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/commits/26968a09c0ea4f3e233fdddbafd1166051a095f6)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoBump leaflet.locatecontrol from 0.72.0 to 0.72.2
dependabot[bot] [Mon, 8 Feb 2021 05:01:26 +0000 (05:01 +0000)]
Bump leaflet.locatecontrol from 0.72.0 to 0.72.2

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.72.0 to 0.72.2.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.72.0...v0.72.2)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoFix URL generation for atom feed on history page
Tom Hughes [Sun, 7 Feb 2021 15:57:03 +0000 (15:57 +0000)]
Fix URL generation for atom feed on history page

Fixes #3085

3 years agoUse POST to submit OpenID login form
Tom Hughes [Sat, 6 Feb 2021 15:04:33 +0000 (15:04 +0000)]
Use POST to submit OpenID login form

Fixes #3084

3 years agoAllow form post to third party authentication providers
Tom Hughes [Sat, 6 Feb 2021 11:06:47 +0000 (11:06 +0000)]
Allow form post to third party authentication providers

3 years agoMerge remote-tracking branch 'upstream/pull/3082'
Tom Hughes [Thu, 4 Feb 2021 08:44:56 +0000 (08:44 +0000)]
Merge remote-tracking branch 'upstream/pull/3082'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Feb 2021 08:34:30 +0000 (09:34 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate actions/checkout requirement to v2.3.4
dependabot[bot] [Thu, 4 Feb 2021 06:45:23 +0000 (06:45 +0000)]
Update actions/checkout requirement to v2.3.4

Updates the requirements on [actions/checkout](https://github.com/actions/checkout) to permit the latest version.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/commits/5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge pull request #2409 from jalessio/docker-compose-take2
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

3 years agoMerge remote-tracking branch 'upstream/pull/3078'
Tom Hughes [Wed, 3 Feb 2021 14:48:24 +0000 (14:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3078'

3 years agoMerge remote-tracking branch 'upstream/pull/3079'
Tom Hughes [Wed, 3 Feb 2021 14:48:19 +0000 (14:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3079'

3 years agoMerge branch 'pull/2486'
Andy Allan [Wed, 3 Feb 2021 14:22:16 +0000 (14:22 +0000)]
Merge branch 'pull/2486'

3 years agoRemove /api/0.6/changes endpoint
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

3 years agoRework welcome message to use bootstrap buttons
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.

3 years agoRefactor the export form to use bootstrap form controls
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.

3 years agoUse small bootstrap buttons for oauth client actions
Andy Allan [Wed, 3 Feb 2021 10:22:05 +0000 (10:22 +0000)]
Use small bootstrap buttons for oauth client actions

3 years agoUse small bootstrap buttons for message inbox and outbox actions
Andy Allan [Wed, 3 Feb 2021 10:21:48 +0000 (10:21 +0000)]
Use small bootstrap buttons for message inbox and outbox actions

3 years agoRefactor user_blocks revoke form to use bootstrap
Andy Allan [Wed, 3 Feb 2021 09:47:52 +0000 (09:47 +0000)]
Refactor user_blocks revoke form to use bootstrap

3 years agoUse bootstrap form styles for update home checkbox
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.

3 years agoUpdate to Omniauth 2.x
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.

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 2 Feb 2021 18:49:18 +0000 (18:49 +0000)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 2 Feb 2021 18:42:57 +0000 (18:42 +0000)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Feb 2021 14:32:34 +0000 (15:32 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3077'
Tom Hughes [Mon, 1 Feb 2021 08:18:42 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/3077'

3 years agoBump eslint from 7.18.0 to 7.19.0
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>
3 years agoAdded /home/osm/traces and /home/osm/images to persistent Docker-compose volumes
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

3 years agoCreate directories for traces and images
Michal Migurski [Sat, 2 Jan 2021 23:05:47 +0000 (15:05 -0800)]
Create directories for traces and images

3 years agoSwitched to Docker volumn for DB data
Michal Migurski [Wed, 30 Dec 2020 22:51:13 +0000 (14:51 -0800)]
Switched to Docker volumn for DB data

3 years agoAdded complete Rails test suite
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

3 years agoPrevent node_modules from mounting to save rake yarn:install step
Jamie Alessio [Tue, 29 Dec 2020 18:11:15 +0000 (10:11 -0800)]
Prevent node_modules from mounting to save rake yarn:install step

3 years agoMade Bootsnap required only when asked-for
Michal Migurski [Mon, 28 Dec 2020 19:21:50 +0000 (11:21 -0800)]
Made Bootsnap required only when asked-for

3 years agoApplied documentation suggestions from code review
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>
3 years agoMigrated from ruby:2.7 Docker image to ubuntu:20.04
Michal Migurski [Fri, 18 Dec 2020 06:45:25 +0000 (22:45 -0800)]
Migrated from ruby:2.7 Docker image to ubuntu:20.04

3 years agoExtended Docker action to cover full setup and tests
Michal Migurski [Sun, 20 Dec 2020 18:03:31 +0000 (10:03 -0800)]
Extended Docker action to cover full setup and tests

3 years agoAdded minimal Docker workflow to test Github Actions
Michal Migurski [Sun, 20 Dec 2020 17:50:41 +0000 (09:50 -0800)]
Added minimal Docker workflow to test Github Actions

3 years agoSwitched tests to "openstreetmap"
Michal Migurski [Thu, 17 Dec 2020 02:12:05 +0000 (18:12 -0800)]
Switched tests to "openstreetmap"

3 years agoUpdate INSTALL.md to restore original graf
Michal Migurski [Thu, 17 Dec 2020 02:02:56 +0000 (18:02 -0800)]
Update INSTALL.md to restore original graf

This reverts commit 20dbf8946351b71fbb4cda69ebdacb1dda2876a6.

3 years agoNoted yarn step in Docker instructions
Michal Migurski [Sat, 12 Dec 2020 19:55:36 +0000 (11:55 -0800)]
Noted yarn step in Docker instructions

3 years agoExpanded yarn call to fix test failure
Michal Migurski [Sat, 14 Nov 2020 00:53:02 +0000 (16:53 -0800)]
Expanded yarn call to fix test failure

3 years agoBumped Ruby version to 2.7 to match CI config
Michal Migurski [Fri, 13 Nov 2020 22:31:31 +0000 (14:31 -0800)]
Bumped Ruby version to 2.7 to match CI config

3 years agoReplaced raw PGSQL testing file with Osmosis-driven XML file
Michal Migurski [Sun, 15 Mar 2020 22:40:27 +0000 (15:40 -0700)]
Replaced raw PGSQL testing file with Osmosis-driven XML file

3 years agoAdded API read to docker-compose test
Michal Migurski [Wed, 19 Feb 2020 05:43:32 +0000 (21:43 -0800)]
Added API read to docker-compose test

3 years agoAdded new parallel test job for docker-compose
Michal Migurski [Mon, 17 Feb 2020 07:43:15 +0000 (23:43 -0800)]
Added new parallel test job for docker-compose

3 years agoUpdate INSTALL.md to reference Docker as an option
Jamie Alessio [Mon, 2 Mar 2020 03:22:19 +0000 (03:22 +0000)]
Update INSTALL.md to reference Docker as an option

3 years agoClarifications to Docker instructions
Jamie Alessio [Mon, 2 Mar 2020 03:18:25 +0000 (03:18 +0000)]
Clarifications to Docker instructions

3 years agoput osmosis installation back
Jamie Alessio [Mon, 2 Mar 2020 03:12:22 +0000 (03:12 +0000)]
put osmosis installation back

3 years agoIgnore additional 'large' directories during Docker build step
Jamie Alessio [Mon, 2 Mar 2020 03:03:31 +0000 (03:03 +0000)]
Ignore additional 'large' directories during Docker build step

3 years agoSimplify Dockerfile
Jamie Alessio [Mon, 2 Mar 2020 03:02:45 +0000 (03:02 +0000)]
Simplify Dockerfile

3 years agoPostgres is no longer starting
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

3 years agoMore DOCKER.md cleanup
Jamie Alessio [Mon, 28 Oct 2019 01:00:03 +0000 (01:00 +0000)]
More DOCKER.md cleanup

3 years agoDocker readme updates
Jamie Alessio [Mon, 28 Oct 2019 00:55:07 +0000 (17:55 -0700)]
Docker readme updates

3 years agoDon't try to introduce top-level Makefile at this time
Jamie Alessio [Sat, 26 Oct 2019 19:13:09 +0000 (12:13 -0700)]
Don't try to introduce top-level Makefile at this time

3 years agoFix mismatched quote and pluralization
Jamie Alessio [Thu, 24 Oct 2019 15:04:11 +0000 (08:04 -0700)]
Fix mismatched quote and pluralization

3 years agoUpdate Docker instructions to avoid copying entire settings file
Jamie Alessio [Thu, 24 Oct 2019 15:01:42 +0000 (08:01 -0700)]
Update Docker instructions to avoid copying entire settings file

3 years agoAdd Docker README and Makefile for helper commands
Jamie Alessio [Tue, 22 Oct 2019 19:48:39 +0000 (19:48 +0000)]
Add Docker README and Makefile for helper commands

3 years agoIntroduce docker-compose config for development
Jamie Alessio [Tue, 22 Oct 2019 19:48:02 +0000 (19:48 +0000)]
Introduce docker-compose config for development

3 years agoAvoid password manager autocompletion on user settings page
Tom Hughes [Thu, 28 Jan 2021 11:33:01 +0000 (11:33 +0000)]
Avoid password manager autocompletion on user settings page

3 years agoMerge remote-tracking branch 'upstream/pull/3074'
Tom Hughes [Thu, 28 Jan 2021 10:41:06 +0000 (10:41 +0000)]
Merge remote-tracking branch 'upstream/pull/3074'

3 years agoMerge remote-tracking branch 'upstream/pull/3073'
Tom Hughes [Thu, 28 Jan 2021 10:36:38 +0000 (10:36 +0000)]
Merge remote-tracking branch 'upstream/pull/3073'