]> git.openstreetmap.org Git - rails.git/log
rails.git
13 months ago.github/workflows/lint.yml: Add task verifying annotations are up2date
Gregory Igelmund [Sat, 14 Oct 2023 03:22:40 +0000 (11:22 +0800)]
.github/workflows/lint.yml: Add task verifying annotations are up2date

13 months agoAnnotate models
Gregory Igelmund [Sat, 14 Oct 2023 03:19:13 +0000 (11:19 +0800)]
Annotate models

13 months agoUpdate bundle
Tom Hughes [Tue, 10 Oct 2023 17:35:20 +0000 (18:35 +0100)]
Update bundle

13 months agoMerge remote-tracking branch 'upstream/pull/4276'
Tom Hughes [Tue, 10 Oct 2023 17:19:13 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4276'

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Oct 2023 11:22:50 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoDrop redundant primary key specification for languages table
Tom Hughes [Sat, 7 Oct 2023 14:08:30 +0000 (15:08 +0100)]
Drop redundant primary key specification for languages table

13 months agoDrop workaround to force UTF8 form upload in IE8
Tom Hughes [Sat, 7 Oct 2023 10:57:54 +0000 (11:57 +0100)]
Drop workaround to force UTF8 form upload in IE8

This has been disabled by default in rails for some time.

13 months agoBump eslint from 8.50.0 to 8.51.0
dependabot[bot] [Fri, 6 Oct 2023 23:42:27 +0000 (23:42 +0000)]
Bump eslint from 8.50.0 to 8.51.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.51.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.51.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
13 months agoFix rails 7.1.0 deprecation warning
Tom Hughes [Fri, 6 Oct 2023 18:07:19 +0000 (19:07 +0100)]
Fix rails 7.1.0 deprecation warning

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Oct 2023 11:20:32 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoMerge remote-tracking branch 'upstream/pull/4274'
Tom Hughes [Wed, 4 Oct 2023 18:10:47 +0000 (19:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4274'

13 months agoMerge pull request #4257 from tordans/docker-compose
Andy Allan [Wed, 4 Oct 2023 17:48:56 +0000 (18:48 +0100)]
Merge pull request #4257 from tordans/docker-compose

Docker: Use `docker compose`

13 months agoDocker: Use `docker compose` in Docs and Workflow
Tobias [Thu, 21 Sep 2023 08:15:54 +0000 (10:15 +0200)]
Docker: Use `docker compose` in Docs and Workflow

Also extend "Tests" section on how to prepare the tests

13 months agoPrefer find_by() instead of where().first
Andy Allan [Wed, 4 Oct 2023 16:53:58 +0000 (17:53 +0100)]
Prefer find_by() instead of where().first

These are very similar, differing only if we would expect multiple
results and the sorting is important. However, in all our cases
we're only expecting one result to be returned, and so find_by is
easier to read.

13 months agoMerge remote-tracking branch 'upstream/pull/4226'
Tom Hughes [Tue, 3 Oct 2023 18:39:41 +0000 (19:39 +0100)]
Merge remote-tracking branch 'upstream/pull/4226'

13 months agoLoad openid signing key from endpoint during openid connect test
Milan Cvetkovic [Thu, 21 Sep 2023 10:51:30 +0000 (10:51 +0000)]
Load openid signing key from endpoint during openid connect test

13 months agoAdd test for openid discovery
Milan Cvetkovic [Fri, 15 Sep 2023 18:03:16 +0000 (18:03 +0000)]
Add test for openid discovery

13 months agoAdd a test for openid connect support
Milan Cvetkovic [Fri, 15 Sep 2023 12:24:35 +0000 (12:24 +0000)]
Add a test for openid connect support

13 months agoAdd openid connect support using doorkeeper-openid_connect gem
Milan Cvetkovic [Wed, 30 Aug 2023 12:36:55 +0000 (12:36 +0000)]
Add openid connect support using doorkeeper-openid_connect gem

... as discussed in [Issue 507](https://github.com/openstreetmap/operations/issues/507)
and described by @mmd-osm.

To activate, set the value of `doorkeeper_signing_key` to RSA private key.

Allows using openstreetmap as an identity provider.

Adds `openid` scope to OAuth2 authorizations, required to login to OSM.

Currently, the only claims returned are:
 - "openid" scope: "sub" and "preferred_username"
 - "read_email" scope: "email"

13 months agoMerge locale definitions to config/locales/en.yml
Milan Cvetkovic [Mon, 4 Sep 2023 14:46:29 +0000 (14:46 +0000)]
Merge locale definitions to config/locales/en.yml

13 months agoAdd unconfigured doorkeeper-openid_connect
Milan Cvetkovic [Wed, 30 Aug 2023 12:19:00 +0000 (12:19 +0000)]
Add unconfigured doorkeeper-openid_connect

After executing:
rails generate doorkeeper:openid_connect:install
rails generate doorkeeper:openid_connect:install

Split migration script to 2 to avoid deadlock.

13 months agoUpdate bundle
Tom Hughes [Tue, 3 Oct 2023 16:01:37 +0000 (17:01 +0100)]
Update bundle

13 months agoMerge remote-tracking branch 'upstream/pull/4271'
Tom Hughes [Tue, 3 Oct 2023 16:00:13 +0000 (17:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4271'

13 months agoRemove <picture>s around <img srcset=...>
Anton Khorev [Tue, 3 Oct 2023 00:06:12 +0000 (03:06 +0300)]
Remove <picture>s around <img srcset=...>

13 months agoMerge remote-tracking branch 'upstream/pull/4269'
Tom Hughes [Mon, 2 Oct 2023 17:53:14 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4269'

13 months agoMerge remote-tracking branch 'upstream/pull/4268'
Tom Hughes [Mon, 2 Oct 2023 17:48:52 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4268'

13 months agoMerge remote-tracking branch 'upstream/pull/4266'
Tom Hughes [Mon, 2 Oct 2023 17:47:21 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4266'

13 months agoMerge remote-tracking branch 'upstream/pull/4267'
Tom Hughes [Mon, 2 Oct 2023 17:45:53 +0000 (18:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4267'

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Oct 2023 11:19:00 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoRemove <picture> from logo
Anton Khorev [Mon, 2 Oct 2023 01:12:47 +0000 (04:12 +0300)]
Remove <picture> from logo

13 months agoRemove custom color from changeset comments count
Anton Khorev [Sun, 1 Oct 2023 23:13:18 +0000 (02:13 +0300)]
Remove custom color from changeset comments count

13 months agoRemove custom opacity from changeset comments count
Anton Khorev [Sun, 1 Oct 2023 23:06:38 +0000 (02:06 +0300)]
Remove custom opacity from changeset comments count

13 months agoRemove rtl direction fix for <code>
Anton Khorev [Sun, 1 Oct 2023 15:40:10 +0000 (18:40 +0300)]
Remove rtl direction fix for <code>

13 months agoLimit nav color override to edit/history/export buttons
Anton Khorev [Sun, 1 Oct 2023 15:00:18 +0000 (18:00 +0300)]
Limit nav color override to edit/history/export buttons

13 months agoWrite button instead of link for 'Where is this?'
Anton Khorev [Sat, 16 Sep 2023 15:10:52 +0000 (18:10 +0300)]
Write button instead of link for 'Where is this?'

13 months agoMake search input a direct child of input group
Anton Khorev [Sat, 16 Sep 2023 14:40:07 +0000 (17:40 +0300)]
Make search input a direct child of input group

13 months agoMerge remote-tracking branch 'upstream/pull/4261'
Tom Hughes [Fri, 29 Sep 2023 09:05:31 +0000 (10:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4261'

13 months agoUpgrade to bootstrap 5.2
Andy Allan [Wed, 20 Sep 2023 14:59:24 +0000 (15:59 +0100)]
Upgrade to bootstrap 5.2

13 months agoMerge remote-tracking branch 'upstream/pull/4264'
Tom Hughes [Thu, 28 Sep 2023 20:15:52 +0000 (21:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4264'

13 months agoFix border settings used in workaround
Andy Allan [Thu, 28 Sep 2023 20:01:41 +0000 (21:01 +0100)]
Fix border settings used in workaround

Fixes #4263

13 months agoMerge remote-tracking branch 'upstream/pull/4260'
Tom Hughes [Thu, 28 Sep 2023 15:35:05 +0000 (16:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4260'

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Sep 2023 11:19:02 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoMerge pull request #3690 from AntonKhorev/search-form-no-group
Andy Allan [Wed, 27 Sep 2023 16:36:35 +0000 (17:36 +0100)]
Merge pull request #3690 from AntonKhorev/search-form-no-group

Stick search input and Go button together with flex instead of input group

13 months agoMerge pull request #4201 from AntonKhorev/issues-limit-settings
Andy Allan [Wed, 27 Sep 2023 14:47:44 +0000 (15:47 +0100)]
Merge pull request #4201 from AntonKhorev/issues-limit-settings

Move max value of issues counter to settings

13 months agoMerge pull request #4249 from AntonKhorev/no-traces-nav-empty-li
Andy Allan [Wed, 27 Sep 2023 14:33:58 +0000 (15:33 +0100)]
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li

Change traces feed and upload button alignment

13 months agoMerge pull request #4184 from AntonKhorev/print
Andy Allan [Wed, 27 Sep 2023 14:10:52 +0000 (15:10 +0100)]
Merge pull request #4184 from AntonKhorev/print

Show sidebar in print media

13 months agoWorkaround for dartsass vs bootstrap 5.1 bug
Andy Allan [Wed, 27 Sep 2023 08:23:26 +0000 (09:23 +0100)]
Workaround for dartsass vs bootstrap 5.1 bug

13 months agoSwitch from sassc-rails to dartsass-sprockets
Andy Allan [Wed, 20 Sep 2023 14:26:58 +0000 (15:26 +0100)]
Switch from sassc-rails to dartsass-sprockets

sassc-rails, and its underlying libsass, is deprecated. dartsass-sprockets
allows us to use the currently maintained dartsass implementation,
without having to change any of our toolchain.

The version of sass-embedded is pinned to avoid warnings in bootstrap. When
we upgrade bootstrap versions, we can upgrade sass-embedded to match.

13 months agoInstall git in Docker to allow git repos in Gemfile
Andy Allan [Wed, 20 Sep 2023 15:50:44 +0000 (16:50 +0100)]
Install git in Docker to allow git repos in Gemfile

13 months agoFix new rubocop warnings
Tom Hughes [Tue, 26 Sep 2023 17:35:05 +0000 (18:35 +0100)]
Fix new rubocop warnings

13 months agoUpdate bundle
Tom Hughes [Tue, 26 Sep 2023 17:21:09 +0000 (18:21 +0100)]
Update bundle

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Sep 2023 11:17:56 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoMerge remote-tracking branch 'upstream/pull/4258'
Tom Hughes [Sun, 24 Sep 2023 17:34:50 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4258'

13 months agoBump eslint from 8.49.0 to 8.50.0
dependabot[bot] [Fri, 22 Sep 2023 23:47:53 +0000 (23:47 +0000)]
Bump eslint from 8.49.0 to 8.50.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.49.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.49.0...v8.50.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoAdd whitespace
Tom Hughes [Fri, 22 Sep 2023 16:54:18 +0000 (17:54 +0100)]
Add whitespace

14 months agoMerge remote-tracking branch 'upstream/pull/4255'
Tom Hughes [Fri, 22 Sep 2023 16:45:42 +0000 (17:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4255'

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Sep 2023 11:32:19 +0000 (13:32 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoAdd Tracestrack Topo as featured layer
Paul Norman [Wed, 20 Sep 2023 05:16:42 +0000 (22:16 -0700)]
Add Tracestrack Topo as featured layer

14 months agoUpdate leaflet-osm repo owner
Paul Norman [Wed, 20 Sep 2023 04:56:54 +0000 (21:56 -0700)]
Update leaflet-osm repo owner

14 months agoDrop rubocop config patch now that rubocop-factory_bot is fixed
Tom Hughes [Tue, 19 Sep 2023 10:32:23 +0000 (11:32 +0100)]
Drop rubocop config patch now that rubocop-factory_bot is fixed

14 months agoUpdate bundle
Tom Hughes [Tue, 19 Sep 2023 09:48:09 +0000 (10:48 +0100)]
Update bundle

14 months agoLimit SOTM EU banner to one month
Tom Hughes [Tue, 19 Sep 2023 08:33:20 +0000 (09:33 +0100)]
Limit SOTM EU banner to one month

14 months agoAllow banners to have a start date as well as an end date
Tom Hughes [Tue, 19 Sep 2023 08:33:03 +0000 (09:33 +0100)]
Allow banners to have a start date as well as an end date

14 months agoAdd banner for State of the Map Europe 2023
Marjan Van de Kauter [Tue, 19 Sep 2023 08:17:30 +0000 (09:17 +0100)]
Add banner for State of the Map Europe 2023

Closes #4252

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Sep 2023 11:18:08 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoTweak sizes and alignment of traces rss/upload buttons
Anton Khorev [Thu, 14 Sep 2023 18:00:57 +0000 (21:00 +0300)]
Tweak sizes and alignment of traces rss/upload buttons

14 months agoMerge remote-tracking branch 'upstream/pull/4240'
Tom Hughes [Thu, 14 Sep 2023 16:42:04 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4240'

14 months agoMerge remote-tracking branch 'upstream/pull/4247'
Tom Hughes [Thu, 14 Sep 2023 16:09:31 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/4247'

14 months agoUse start margin instead of empty <li> for gap before traces rss button
Anton Khorev [Thu, 14 Sep 2023 15:02:55 +0000 (18:02 +0300)]
Use start margin instead of empty <li> for gap before traces rss button

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Sep 2023 11:22:37 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoRefactor remaining sass division operators to use multiplication
Andy Allan [Wed, 13 Sep 2023 12:26:19 +0000 (13:26 +0100)]
Refactor remaining sass division operators to use multiplication

14 months agoRemove unusual margins and line-height from comments
Andy Allan [Wed, 13 Sep 2023 12:18:30 +0000 (13:18 +0100)]
Remove unusual margins and line-height from comments

This allows them to follow normal conventions used elsewhere, as
well as removing some custom css.

14 months agoRemove sass division for export input boxes margins
Andy Allan [Wed, 13 Sep 2023 10:42:12 +0000 (11:42 +0100)]
Remove sass division for export input boxes margins

14 months agoRemove custom styling from export alternative sources dl
Andy Allan [Wed, 13 Sep 2023 10:35:55 +0000 (11:35 +0100)]
Remove custom styling from export alternative sources dl

These were mostly the same as the bootstrap defaults.

14 months agoRefactor the directions table to use bootstrap table styling
Andy Allan [Wed, 13 Sep 2023 10:30:50 +0000 (11:30 +0100)]
Refactor the directions table to use bootstrap table styling

This allows us to remove some custom CSS

14 months agoUse spacer for margins on leaflet popups
Andy Allan [Thu, 7 Sep 2023 09:26:50 +0000 (10:26 +0100)]
Use spacer for margins on leaflet popups

14 months agoUse an inline list for the login auth buttons
Andy Allan [Wed, 6 Sep 2023 17:35:12 +0000 (18:35 +0100)]
Use an inline list for the login auth buttons

14 months agoUse multiplication for secondary-actions margin and padding
Andy Allan [Wed, 6 Sep 2023 17:23:22 +0000 (18:23 +0100)]
Use multiplication for secondary-actions margin and padding

This avoids using the sass division operator, which is deprecated.

14 months agoRemove unnecessary paragraph margin override on diary comments
Andy Allan [Wed, 6 Sep 2023 17:22:58 +0000 (18:22 +0100)]
Remove unnecessary paragraph margin override on diary comments

14 months agoUpdate bundle
Tom Hughes [Tue, 12 Sep 2023 17:12:06 +0000 (18:12 +0100)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Sep 2023 11:18:30 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/4239'
Tom Hughes [Sun, 10 Sep 2023 17:47:07 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4239'

14 months agoMerge remote-tracking branch 'upstream/pull/4245'
Tom Hughes [Sun, 10 Sep 2023 16:24:16 +0000 (17:24 +0100)]
Merge remote-tracking branch 'upstream/pull/4245'

14 months agoMerge remote-tracking branch 'upstream/pull/4243'
Tom Hughes [Sun, 10 Sep 2023 16:23:24 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/4243'

14 months agoMerge remote-tracking branch 'upstream/pull/4242'
Tom Hughes [Sun, 10 Sep 2023 16:22:21 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4242'

14 months agoUpdate to rails 7.0.8
Tom Hughes [Sun, 10 Sep 2023 16:11:17 +0000 (17:11 +0100)]
Update to rails 7.0.8

14 months agoAdd comment ids to changeset discussion api responses
Anton Khorev [Sun, 10 Sep 2023 14:10:31 +0000 (17:10 +0300)]
Add comment ids to changeset discussion api responses

14 months agoRemove authorize_web call from traces api controller
Anton Khorev [Sat, 9 Sep 2023 16:40:28 +0000 (19:40 +0300)]
Remove authorize_web call from traces api controller

14 months agoAdd json output for show user block api
Anton Khorev [Sat, 9 Sep 2023 13:41:10 +0000 (16:41 +0300)]
Add json output for show user block api

14 months agoAdd show user block api endpoint
Anton Khorev [Fri, 8 Sep 2023 12:25:15 +0000 (15:25 +0300)]
Add show user block api endpoint

14 months agoCombine comments and traces pagination partials
Anton Khorev [Mon, 4 Sep 2023 13:25:35 +0000 (16:25 +0300)]
Combine comments and traces pagination partials

14 months agoDon't interpolate in pagination partial
Anton Khorev [Mon, 4 Sep 2023 12:41:09 +0000 (15:41 +0300)]
Don't interpolate in pagination partial

14 months agoMake pagination partial view
Anton Khorev [Mon, 4 Sep 2023 12:07:54 +0000 (15:07 +0300)]
Make pagination partial view

14 months agoRefactor diary paging queries
Anton Khorev [Mon, 4 Sep 2023 11:13:43 +0000 (14:13 +0300)]
Refactor diary paging queries

14 months agoChange diary comments pagination to before/after id
Anton Khorev [Mon, 4 Sep 2023 10:12:25 +0000 (13:12 +0300)]
Change diary comments pagination to before/after id

14 months agoBump eslint from 8.48.0 to 8.49.0
dependabot[bot] [Fri, 8 Sep 2023 23:16:24 +0000 (23:16 +0000)]
Bump eslint from 8.48.0 to 8.49.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.48.0...v8.49.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoMerge remote-tracking branch 'upstream/pull/4241'
Tom Hughes [Fri, 8 Sep 2023 17:09:00 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/4241'

14 months agoMerge remote-tracking branch 'upstream/pull/4236'
Tom Hughes [Fri, 8 Sep 2023 16:55:54 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4236'

14 months agoMerge remote-tracking branch 'upstream/pull/4237'
Tom Hughes [Fri, 8 Sep 2023 16:53:42 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4237'

14 months agoAdd user id to api trace output
Anton Khorev [Fri, 8 Sep 2023 14:13:57 +0000 (17:13 +0300)]
Add user id to api trace output