]> git.openstreetmap.org Git - rails.git/log
rails.git
2 months agoMerge branch 'pull/5228'
Anton Khorev [Fri, 20 Sep 2024 22:56:25 +0000 (01:56 +0300)]
Merge branch 'pull/5228'

2 months agoMerge remote-tracking branch 'upstream/pull/5229'
Tom Hughes [Fri, 20 Sep 2024 21:38:26 +0000 (22:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5229'

2 months agoBump puma from 5.6.8 to 5.6.9
dependabot[bot] [Fri, 20 Sep 2024 19:25:11 +0000 (19:25 +0000)]
Bump puma from 5.6.8 to 5.6.9

Bumps [puma](https://github.com/puma/puma) from 5.6.8 to 5.6.9.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.8...v5.6.9)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoDrop ignore of removed creation_ip column
Tom Hughes [Fri, 20 Sep 2024 18:21:58 +0000 (19:21 +0100)]
Drop ignore of removed creation_ip column

2 months agoMerge remote-tracking branch 'upstream/pull/5226'
Tom Hughes [Fri, 20 Sep 2024 18:19:13 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/5226'

2 months agoMerge remote-tracking branch 'upstream/pull/5223'
Tom Hughes [Fri, 20 Sep 2024 18:18:11 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5223'

2 months agoDon't include stack backtraces on xml errors when importing traces
Anton Khorev [Thu, 19 Sep 2024 15:38:50 +0000 (18:38 +0300)]
Don't include stack backtraces on xml errors when importing traces

2 months agoSuppress writing xml parse errors to stderr
Anton Khorev [Fri, 20 Sep 2024 13:33:20 +0000 (16:33 +0300)]
Suppress writing xml parse errors to stderr

2 months agoRemoved unused translation keys from changesets.*
Nenad Vujicic [Wed, 18 Sep 2024 20:59:54 +0000 (22:59 +0200)]
Removed unused translation keys from changesets.*

Removed unused translation keys changesets.{changeset.anonymous, no_such_entry.title} from en.yml. .anonymous was added in fddda4e and was stopped being used in 3e305fb. .title was added in f0764d3 but never used.

2 months agoMerge remote-tracking branch 'upstream/pull/5225'
Tom Hughes [Thu, 19 Sep 2024 17:05:14 +0000 (18:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5225'

2 months agoMerge remote-tracking branch 'upstream/pull/5227'
Tom Hughes [Thu, 19 Sep 2024 17:04:00 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5227'

2 months agoBump google-protobuf from 3.25.4 to 3.25.5
dependabot[bot] [Thu, 19 Sep 2024 16:28:30 +0000 (16:28 +0000)]
Bump google-protobuf from 3.25.4 to 3.25.5

Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.4...v3.25.5)

---
updated-dependencies:
- dependency-name: google-protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoMerge branch 'pull/5117'
Anton Khorev [Thu, 19 Sep 2024 13:49:29 +0000 (16:49 +0300)]
Merge branch 'pull/5117'

2 months agoDon't use ?: in "Comment from user" changeset discussion strings
Anton Khorev [Thu, 19 Sep 2024 12:58:07 +0000 (15:58 +0300)]
Don't use ?: in "Comment from user" changeset discussion strings

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Sep 2024 12:14:54 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoMerge branch 'pull/5209'
Anton Khorev [Wed, 18 Sep 2024 12:28:13 +0000 (15:28 +0300)]
Merge branch 'pull/5209'

2 months agoMerge remote-tracking branch 'upstream/pull/5221'
Tom Hughes [Wed, 18 Sep 2024 08:32:29 +0000 (09:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5221'

2 months agoMerge remote-tracking branch 'upstream/pull/5220'
Tom Hughes [Wed, 18 Sep 2024 08:31:53 +0000 (09:31 +0100)]
Merge remote-tracking branch 'upstream/pull/5220'

2 months agoAdded greeting to friendship notification
Nenad Vujicic [Tue, 17 Sep 2024 21:20:41 +0000 (23:20 +0200)]
Added greeting to friendship notification

Added greeting 'Hi {user display name},' to friendship notification email. As a side effect, user_mailer.friendship_notification.hi is not anymore reported as unused.

2 months agoUpdate bundle
Tom Hughes [Tue, 17 Sep 2024 17:57:42 +0000 (18:57 +0100)]
Update bundle

2 months agoRemove unnecessary comma from several translatable messages
Amir E. Aharoni [Tue, 17 Sep 2024 14:46:18 +0000 (10:46 -0400)]
Remove unnecessary comma from several translatable messages

2 months agoMerge branch 'pull/5212'
Anton Khorev [Tue, 17 Sep 2024 12:26:19 +0000 (15:26 +0300)]
Merge branch 'pull/5212'

2 months agoDrop creation_ip column
Tom Hughes [Fri, 13 Sep 2024 17:23:50 +0000 (18:23 +0100)]
Drop creation_ip column

2 months agoMerge branch 'pull/5218'
Anton Khorev [Mon, 16 Sep 2024 12:17:27 +0000 (15:17 +0300)]
Merge branch 'pull/5218'

2 months agoIgnore the creation_ip column which is no longer used
Tom Hughes [Sun, 15 Sep 2024 18:35:05 +0000 (19:35 +0100)]
Ignore the creation_ip column which is no longer used

2 months agoReplace creation_ip with creation_address
Tom Hughes [Sun, 15 Sep 2024 18:37:48 +0000 (19:37 +0100)]
Replace creation_ip with creation_address

2 months agoMerge remote-tracking branch 'upstream/pull/5203'
Tom Hughes [Sun, 15 Sep 2024 18:30:22 +0000 (19:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5203'

2 months agoMerge remote-tracking branch 'upstream/pull/5217'
Tom Hughes [Sun, 15 Sep 2024 18:20:30 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/5217'

2 months agoMerge remote-tracking branch 'upstream/pull/5214'
Tom Hughes [Sun, 15 Sep 2024 18:08:31 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/5214'

2 months agoMerge remote-tracking branch 'upstream/pull/5213'
Tom Hughes [Sun, 15 Sep 2024 17:54:48 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5213'

2 months agoRemove unused Namefinder translation strings
mmd-osm [Sun, 15 Sep 2024 16:56:21 +0000 (18:56 +0200)]
Remove unused Namefinder translation strings

Namefinder was introduced in commit d2bd786 and later removed in fcebfd1f. Since then, these translation strings are unused.

Analysis using: `git log -p -S "towns" -- ':(exclude)*config/locales/*.yml' ':(exclude)*vendor/assets/*'`

2 months agoRemove unused .greeting translation in changeset_comment_notification
mmd-osm [Sun, 15 Sep 2024 16:35:21 +0000 (18:35 +0200)]
Remove unused .greeting translation in changeset_comment_notification

Text and html templates use .hi instead

2 months agoRemove unused translation key users.new.external auth
mmd-osm [Sun, 15 Sep 2024 09:11:00 +0000 (11:11 +0200)]
Remove unused translation key users.new.external auth

Unused since commit 0c7c950149888777e186e2eb7525b37f340bc6f0

2 months agoIgnore users.auth_failure.* as unused translation
mmd-osm [Sun, 15 Sep 2024 08:57:12 +0000 (10:57 +0200)]
Ignore users.auth_failure.* as unused translation

Translation keys are used for OmniAuth callbacks, and defined by the
respective OmniAuth provider. It is expected that these strings are
unsued in the OSM website repo.

2 months agoShow friend options only when user is logged in
Nenad Vujicic [Thu, 12 Sep 2024 11:36:44 +0000 (13:36 +0200)]
Show friend options only when user is logged in

Fixes #5199. Displays "Add Friend" and "Unfriend" links (buttons) on user profile page only if user is logged-in.

2 months agoFix browse elements timeouts
Anton Khorev [Thu, 4 Apr 2024 13:44:53 +0000 (16:44 +0300)]
Fix browse elements timeouts

2 months agoAlways show changeset element page links below headings
Anton Khorev [Sat, 14 Sep 2024 14:15:11 +0000 (17:15 +0300)]
Always show changeset element page links below headings

2 months agoMerge remote-tracking branch 'upstream/pull/5211'
Tom Hughes [Sat, 14 Sep 2024 09:55:50 +0000 (10:55 +0100)]
Merge remote-tracking branch 'upstream/pull/5211'

2 months agoMerge remote-tracking branch 'upstream/pull/5178'
Tom Hughes [Fri, 13 Sep 2024 17:09:37 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/5178'

2 months agoFix element pagination width calculation
Anton Khorev [Fri, 13 Sep 2024 15:50:22 +0000 (18:50 +0300)]
Fix element pagination width calculation

2 months agoMerge branch 'pull/5207'
Anton Khorev [Fri, 13 Sep 2024 10:16:27 +0000 (13:16 +0300)]
Merge branch 'pull/5207'

2 months agoBackfill the creation_address column from creation_ip
Tom Hughes [Thu, 12 Sep 2024 18:25:29 +0000 (19:25 +0100)]
Backfill the creation_address column from creation_ip

2 months agoMerge branch 'pull/5206'
Anton Khorev [Fri, 13 Sep 2024 09:18:17 +0000 (12:18 +0300)]
Merge branch 'pull/5206'

2 months agoMerge branch 'pull/5196'
Anton Khorev [Fri, 13 Sep 2024 08:48:38 +0000 (11:48 +0300)]
Merge branch 'pull/5196'

2 months agoOrder changeset elements for consistent pagination
Tom Hughes [Thu, 12 Sep 2024 21:56:29 +0000 (22:56 +0100)]
Order changeset elements for consistent pagination

2 months agoMerge remote-tracking branch 'upstream/pull/5208'
Tom Hughes [Thu, 12 Sep 2024 21:25:54 +0000 (22:25 +0100)]
Merge remote-tracking branch 'upstream/pull/5208'

2 months agoAdded ignoring unused translations auth.providers
Nenad Vujicic [Thu, 12 Sep 2024 19:47:58 +0000 (21:47 +0200)]
Added ignoring unused translations auth.providers

Added ignoring reporting translations auth.providers.* as unused because they are used at app/views/application/_auth_providers.html.erb, ..

2 months agoRemoved unused translations in activerecord.errors
Nenad Vujicic [Thu, 12 Sep 2024 19:35:44 +0000 (21:35 +0200)]
Removed unused translations in activerecord.errors

Removed unused translations activerecord.errors.messages.{invalid_email_address, email_address_not_routable} started / ended using in 63862d0 / 90a7efc.

2 months agoMake select all checkbox on users list work with turbo
Tom Hughes [Thu, 12 Sep 2024 18:09:47 +0000 (19:09 +0100)]
Make select all checkbox on users list work with turbo

2 months agoMerge remote-tracking branch 'upstream/pull/5204'
Tom Hughes [Thu, 12 Sep 2024 17:30:14 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5204'

2 months agoMerge remote-tracking branch 'upstream/pull/5202'
Tom Hughes [Thu, 12 Sep 2024 17:30:10 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5202'

2 months agoRemove last traces of OPNVKarte layer
Tom Hughes [Wed, 11 Sep 2024 16:50:03 +0000 (17:50 +0100)]
Remove last traces of OPNVKarte layer

2 months agoRemove HTML tags from polish resource
Tom Hughes [Thu, 12 Sep 2024 17:29:21 +0000 (18:29 +0100)]
Remove HTML tags from polish resource

2 months agoRemove HTML tags from polish resource
Tom Hughes [Thu, 12 Sep 2024 17:22:19 +0000 (18:22 +0100)]
Remove HTML tags from polish resource

2 months agoFix friendships limit flash message
Anton Khorev [Thu, 12 Sep 2024 12:42:36 +0000 (15:42 +0300)]
Fix friendships limit flash message

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Sep 2024 12:15:40 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoAdd subway, tram, bus stops to mapnik map key
Anton Khorev [Thu, 12 Sep 2024 11:03:31 +0000 (14:03 +0300)]
Add subway, tram, bus stops to mapnik map key

2 months agoMerge branch 'pull/5182'
Anton Khorev [Thu, 12 Sep 2024 06:43:56 +0000 (09:43 +0300)]
Merge branch 'pull/5182'

2 months agoMerge branch 'pull/5181'
Anton Khorev [Thu, 12 Sep 2024 06:18:49 +0000 (09:18 +0300)]
Merge branch 'pull/5181'

2 months agoLimit the number of users counted for users#index
Tom Hughes [Tue, 10 Sep 2024 17:50:38 +0000 (18:50 +0100)]
Limit the number of users counted for users#index

This view uses cursor based pagination but then undermines
that by counting the total number of users so limit the effect
of that but counting a maximum of ten pages of users.

2 months agoMerge remote-tracking branch 'upstream/pull/5189'
Tom Hughes [Wed, 11 Sep 2024 16:13:56 +0000 (17:13 +0100)]
Merge remote-tracking branch 'upstream/pull/5189'

2 months agoMerge remote-tracking branch 'upstream/pull/5186'
Tom Hughes [Wed, 11 Sep 2024 16:12:13 +0000 (17:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5186'

2 months agoMerge remote-tracking branch 'upstream/pull/5190'
Tom Hughes [Wed, 11 Sep 2024 16:09:48 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/5190'

2 months agoMerge remote-tracking branch 'upstream/pull/5188'
Tom Hughes [Wed, 11 Sep 2024 16:09:00 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/5188'

2 months agoMerge remote-tracking branch 'upstream/pull/5185'
Tom Hughes [Wed, 11 Sep 2024 16:06:54 +0000 (17:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5185'

2 months agoMerge remote-tracking branch 'upstream/pull/5184'
Tom Hughes [Wed, 11 Sep 2024 16:06:15 +0000 (17:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5184'

2 months agoRemove :id from redaction path helper calls
Anton Khorev [Wed, 11 Sep 2024 14:55:23 +0000 (17:55 +0300)]
Remove :id from redaction path helper calls

2 months agoReplace 'remove this redaction' confirmation and request with Turbo
Anton Khorev [Wed, 11 Sep 2024 14:43:37 +0000 (17:43 +0300)]
Replace 'remove this redaction' confirmation and request with Turbo

2 months agoMerge branch 'pull/5187'
Anton Khorev [Wed, 11 Sep 2024 13:51:51 +0000 (16:51 +0300)]
Merge branch 'pull/5187'

2 months agoPulled out ?: operator from tr in changesets/index
Nenad Vujicic [Wed, 11 Sep 2024 10:33:29 +0000 (12:33 +0200)]
Pulled out ?: operator from tr in changesets/index

Pulled out ?: operator from tr in changesets/index.html.erb, so, changesets.index.{empty, empty_area, empty_user, no_more, no_more_area, no_more_user} translation keys are not more reported as unused.

2 months agoAdd New Redaction button to redactions page
Anton Khorev [Wed, 11 Sep 2024 11:14:35 +0000 (14:14 +0300)]
Add New Redaction button to redactions page

2 months agoRemove :new abilities implied by :create abilities
Anton Khorev [Wed, 11 Sep 2024 10:57:22 +0000 (13:57 +0300)]
Remove :new abilities implied by :create abilities

2 months agoRename _blocks partial template to _page
Anton Khorev [Wed, 11 Sep 2024 10:38:02 +0000 (13:38 +0300)]
Rename _blocks partial template to _page

2 months agoRemoved unused translations in user_role namespace
Nenad Vujicic [Mon, 9 Sep 2024 19:13:12 +0000 (21:13 +0200)]
Removed unused translations in user_role namespace

Removed user_role.{grant,revoke}.{title, heading, confirm} started / ended using in 30d5e78 and 8a7040e / 5f33656.

2 months agoAdd creation_address column to users
Tom Hughes [Tue, 10 Sep 2024 18:16:03 +0000 (19:16 +0100)]
Add creation_address column to users

This is a properly typed and indexed column that is intended
to replace creation_ip to allow fast queries.

2 months agoMerge remote-tracking branch 'upstream/pull/5116'
Tom Hughes [Tue, 10 Sep 2024 17:37:10 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5116'

2 months agoMerge remote-tracking branch 'upstream/pull/5150'
Tom Hughes [Tue, 10 Sep 2024 17:35:19 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5150'

2 months agoMerge remote-tracking branch 'upstream/pull/5180'
Tom Hughes [Tue, 10 Sep 2024 17:30:02 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5180'

2 months agoMerge remote-tracking branch 'upstream/pull/5179'
Tom Hughes [Tue, 10 Sep 2024 17:27:54 +0000 (18:27 +0100)]
Merge remote-tracking branch 'upstream/pull/5179'

2 months agoMerge remote-tracking branch 'upstream/pull/5168'
Tom Hughes [Tue, 10 Sep 2024 17:24:47 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/5168'

2 months agoUpdate bundle
Tom Hughes [Tue, 10 Sep 2024 17:22:47 +0000 (18:22 +0100)]
Update bundle

2 months agoMark flash messages as temporary
Anton Khorev [Tue, 10 Sep 2024 09:24:08 +0000 (12:24 +0300)]
Mark flash messages as temporary

2 months agoRefactor flash template
Anton Khorev [Tue, 10 Sep 2024 09:13:22 +0000 (12:13 +0300)]
Refactor flash template

2 months agoAdapt richtext javascript to Turbo
Anton Khorev [Sat, 24 Aug 2024 14:51:03 +0000 (17:51 +0300)]
Adapt richtext javascript to Turbo

2 months agoGuess translation scope from controller name if not provided
Anton Khorev [Tue, 10 Sep 2024 07:51:50 +0000 (10:51 +0300)]
Guess translation scope from controller name if not provided

2 months agoMake i18n-tasks ignore shared pagination scope
Anton Khorev [Tue, 10 Sep 2024 07:38:54 +0000 (10:38 +0300)]
Make i18n-tasks ignore shared pagination scope

2 months agoPass translation scope instead of keys to shared pagination
Anton Khorev [Tue, 10 Sep 2024 07:37:36 +0000 (10:37 +0300)]
Pass translation scope instead of keys to shared pagination

2 months agoMerge remote-tracking branch 'upstream/pull/5176'
Tom Hughes [Mon, 9 Sep 2024 17:47:32 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/5176'

2 months agoFix changeset comments feed timeout
Anton Khorev [Sun, 24 Mar 2024 02:01:05 +0000 (05:01 +0300)]
Fix changeset comments feed timeout

2 months agoRespond to timeouts with a server error code
Anton Khorev [Mon, 9 Sep 2024 16:13:29 +0000 (19:13 +0300)]
Respond to timeouts with a server error code

2 months agoTimeout instantly if web_timeout setting is negative
Anton Khorev [Sat, 23 Mar 2024 18:02:48 +0000 (21:02 +0300)]
Timeout instantly if web_timeout setting is negative

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Sep 2024 12:15:12 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoRemoved unused translations from Traces namespace
Nenad Vujicic [Fri, 6 Sep 2024 22:34:13 +0000 (00:34 +0200)]
Removed unused translations from Traces namespace

Removed keys traces.make_public.made_public (started / ended using in 95595ee / 5651714) and traces.trace_optionals.tags (started / ended using in c30f141 / 7410b59).

2 months agoMerge remote-tracking branch 'upstream/pull/5157'
Tom Hughes [Sun, 8 Sep 2024 14:37:23 +0000 (15:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5157'

2 months agoMerge remote-tracking branch 'upstream/pull/5173'
Tom Hughes [Sun, 8 Sep 2024 14:29:09 +0000 (15:29 +0100)]
Merge remote-tracking branch 'upstream/pull/5173'

2 months agoMerge remote-tracking branch 'upstream/pull/5172'
Tom Hughes [Sun, 8 Sep 2024 14:28:33 +0000 (15:28 +0100)]
Merge remote-tracking branch 'upstream/pull/5172'

2 months agoMerge remote-tracking branch 'upstream/pull/5171'
Tom Hughes [Sun, 8 Sep 2024 14:28:30 +0000 (15:28 +0100)]
Merge remote-tracking branch 'upstream/pull/5171'

2 months agoMerge remote-tracking branch 'upstream/pull/5170'
Tom Hughes [Sun, 8 Sep 2024 14:26:46 +0000 (15:26 +0100)]
Merge remote-tracking branch 'upstream/pull/5170'

2 months agoMerge remote-tracking branch 'upstream/pull/5169'
Tom Hughes [Sun, 8 Sep 2024 14:26:15 +0000 (15:26 +0100)]
Merge remote-tracking branch 'upstream/pull/5169'

2 months agoMerge remote-tracking branch 'upstream/pull/5165'
Tom Hughes [Sun, 8 Sep 2024 14:23:58 +0000 (15:23 +0100)]
Merge remote-tracking branch 'upstream/pull/5165'