]> git.openstreetmap.org Git - rails.git/log
rails.git
3 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'

3 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

3 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

3 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.

3 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

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

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

3 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.

3 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'

3 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'

3 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'

3 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'

3 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'

3 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'

3 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

3 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

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

3 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.

3 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

3 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

3 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

3 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.

3 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.

3 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'

3 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'

3 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'

3 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'

3 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'

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

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

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

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

3 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

3 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

3 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

3 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'

3 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.

3 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).

3 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'

3 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'

3 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'

3 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'

3 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'

3 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'

3 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'

3 months agoMove ?: operator outside of t() for "Only ... can edit" block messages
Anton Khorev [Sun, 8 Sep 2024 10:40:54 +0000 (13:40 +0300)]
Move ?: operator outside of t() for "Only ... can edit" block messages

3 months agoRemove unused site.search.get_directions string
Anton Khorev [Sun, 8 Sep 2024 10:23:51 +0000 (13:23 +0300)]
Remove unused site.search.get_directions string

3 months agoRemove unused messages.outbox.actions string
Anton Khorev [Sun, 8 Sep 2024 10:05:42 +0000 (13:05 +0300)]
Remove unused messages.outbox.actions string

3 months agoRemove unused layouts.gps_traces_tooltip string
Anton Khorev [Sun, 8 Sep 2024 09:55:21 +0000 (12:55 +0300)]
Remove unused layouts.gps_traces_tooltip string

3 months agoRemove unused layouts.donate string
Anton Khorev [Sun, 8 Sep 2024 09:46:37 +0000 (12:46 +0300)]
Remove unused layouts.donate string

3 months agoDisable redactions with write_api scope
Anton Khorev [Sun, 8 Sep 2024 09:31:31 +0000 (12:31 +0300)]
Disable redactions with write_api scope

Requires write_redactions scope to redact. Previously it was possible to redact with either write_redactions or write_api.

3 months agoUpdate DOCKER.md with instructions for precompiling assets
Emin Kocan [Sat, 7 Sep 2024 18:53:47 +0000 (20:53 +0200)]
Update DOCKER.md with instructions for precompiling assets

3 months agoSwitch from ubuntu to debian
Emin Kocan [Wed, 4 Sep 2024 23:39:34 +0000 (01:39 +0200)]
Switch from ubuntu to debian

3 months agoBump eslint from 9.9.1 to 9.10.0
dependabot[bot] [Sat, 7 Sep 2024 00:14:30 +0000 (00:14 +0000)]
Bump eslint from 9.9.1 to 9.10.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.9.1 to 9.10.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/v9.9.1...v9.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoMerge remote-tracking branch 'upstream/pull/5164'
Tom Hughes [Fri, 6 Sep 2024 16:05:02 +0000 (17:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5164'

3 months agoMerge remote-tracking branch 'upstream/pull/5163'
Tom Hughes [Fri, 6 Sep 2024 16:04:35 +0000 (17:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5163'

3 months agoMerge remote-tracking branch 'upstream/pull/5162'
Tom Hughes [Fri, 6 Sep 2024 16:02:45 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/5162'

3 months agoMerge remote-tracking branch 'upstream/pull/5161'
Tom Hughes [Fri, 6 Sep 2024 16:02:13 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/5161'

3 months agoMerge remote-tracking branch 'upstream/pull/5160'
Tom Hughes [Fri, 6 Sep 2024 16:00:32 +0000 (17:00 +0100)]
Merge remote-tracking branch 'upstream/pull/5160'

3 months agoRemove :edit abilities implied by :update abilities
Anton Khorev [Fri, 6 Sep 2024 06:28:52 +0000 (09:28 +0300)]
Remove :edit abilities implied by :update abilities

3 months agoRemove Oauth::OAUTH2_SCOPES
Anton Khorev [Fri, 6 Sep 2024 06:14:54 +0000 (09:14 +0300)]
Remove Oauth::OAUTH2_SCOPES

After OAuth1 was removed, all scopes are OAuth2 scopes. Former OAuth2-only scopes now can be combined with the rest.

3 months agoMerge branch 'pull/5115'
Anton Khorev [Fri, 6 Sep 2024 03:04:25 +0000 (06:04 +0300)]
Merge branch 'pull/5115'

3 months agoMerge branch 'pull/5155'
Anton Khorev [Thu, 5 Sep 2024 22:23:36 +0000 (01:23 +0300)]
Merge branch 'pull/5155'

3 months agoRemove unused site.about.next string
Anton Khorev [Thu, 5 Sep 2024 22:15:08 +0000 (01:15 +0300)]
Remove unused site.about.next string

3 months agoRemove unnecessary site.about locale scope from About page
Anton Khorev [Thu, 5 Sep 2024 21:49:09 +0000 (00:49 +0300)]
Remove unnecessary site.about locale scope from About page

3 months agoRemove strings unused since Oct 2013 frontpage redesign
Anton Khorev [Thu, 5 Sep 2024 21:21:32 +0000 (00:21 +0300)]
Remove strings unused since Oct 2013 frontpage redesign

3 months agoMerge remote-tracking branch 'upstream/pull/5159'
Tom Hughes [Thu, 5 Sep 2024 21:21:03 +0000 (22:21 +0100)]
Merge remote-tracking branch 'upstream/pull/5159'

3 months agoMerge remote-tracking branch 'upstream/pull/5152'
Tom Hughes [Thu, 5 Sep 2024 21:20:29 +0000 (22:20 +0100)]
Merge remote-tracking branch 'upstream/pull/5152'

3 months agoRemove messages.message_summary.reply_button string
Anton Khorev [Thu, 5 Sep 2024 20:42:50 +0000 (23:42 +0300)]
Remove messages.message_summary.reply_button string

3 months agoRemove nil ApiCapability user branch
Anton Khorev [Thu, 5 Sep 2024 20:21:24 +0000 (23:21 +0300)]
Remove nil ApiCapability user branch

3 months agoRemove OAuth 1 ApiCapability user branch
Anton Khorev [Tue, 3 Sep 2024 01:05:57 +0000 (04:05 +0300)]
Remove OAuth 1 ApiCapability user branch

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Sep 2024 12:42:55 +0000 (14:42 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoSimplify creation of bearer authorization headers
Tom Hughes [Tue, 3 Sep 2024 17:54:05 +0000 (18:54 +0100)]
Simplify creation of bearer authorization headers

Uses the new features added to the bearer_authorization_header while
dropping basic authentication support to simplify the creation of bearer
authorization headers for API tests.

3 months agoDrop crossdomain policy for OAuth 1 API methods
Tom Hughes [Tue, 3 Sep 2024 16:47:03 +0000 (17:47 +0100)]
Drop crossdomain policy for OAuth 1 API methods

3 months agoUpdate bundle
Tom Hughes [Tue, 3 Sep 2024 16:26:11 +0000 (17:26 +0100)]
Update bundle

3 months agoMerge remote-tracking branch 'upstream/pull/5153'
Tom Hughes [Tue, 3 Sep 2024 16:17:34 +0000 (17:17 +0100)]
Merge remote-tracking branch 'upstream/pull/5153'

3 months agoRemove node.tags_as_hash method
Anton Khorev [Tue, 3 Sep 2024 01:27:07 +0000 (04:27 +0300)]
Remove node.tags_as_hash method

3 months agoRestore monkey patching of OAuth::Helper
Tom Hughes [Mon, 2 Sep 2024 23:25:41 +0000 (00:25 +0100)]
Restore monkey patching of OAuth::Helper

This is needed for omniauth-mediawiki which still uses OAuth 1.

3 months agoUse svg icons in pagination for note lists
Anton Khorev [Mon, 2 Sep 2024 23:10:43 +0000 (02:10 +0300)]
Use svg icons in pagination for note lists

3 months agoUse Bootstrap pagination for note lists
Anton Khorev [Mon, 2 Sep 2024 22:48:34 +0000 (01:48 +0300)]
Use Bootstrap pagination for note lists

3 months agoMove note paging locale strings to notes scope
Anton Khorev [Mon, 2 Sep 2024 22:38:17 +0000 (01:38 +0300)]
Move note paging locale strings to notes scope

3 months agoMerge branch 'pull/5141'
Anton Khorev [Mon, 2 Sep 2024 22:03:13 +0000 (01:03 +0300)]
Merge branch 'pull/5141'

3 months agoMerge remote-tracking branch 'upstream/pull/5146'
Tom Hughes [Mon, 2 Sep 2024 18:16:29 +0000 (19:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5146'

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

3 months agoDrop support for basic authentication
Tom Hughes [Sun, 1 Sep 2024 14:26:35 +0000 (15:26 +0100)]
Drop support for basic authentication

3 months agoMerge branch 'pull/5149'
Anton Khorev [Mon, 2 Sep 2024 15:05:26 +0000 (18:05 +0300)]
Merge branch 'pull/5149'

3 months agoTest changeset not found page
Anton Khorev [Mon, 2 Sep 2024 15:05:03 +0000 (18:05 +0300)]
Test changeset not found page

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

3 months agoFixed bug when requested missing changeset
Nenad Vujicic [Mon, 2 Sep 2024 13:20:07 +0000 (15:20 +0200)]
Fixed bug when requested missing changeset

Fixes #5148. Added forgotten @type = "changeset" in ChangesetsController#show.

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

3 months agoI18n: messages: avoid dynamic translation keys
mmd-osm [Sun, 1 Sep 2024 19:39:05 +0000 (21:39 +0200)]
I18n: messages: avoid dynamic translation keys

By moving the translation outside the loop and calling t(...) with
explicitly stated keys, `bundle exec i18n-tasks unused` no longer
reports the keys as unused.

3 months agoI18n: ignore unused third party translations
mmd-osm [Sun, 1 Sep 2024 19:35:10 +0000 (21:35 +0200)]
I18n: ignore unused third party translations

Ignores doorkeeper namespace in `bundle exec i18n-tasks unused`

3 months agoMerge remote-tracking branch 'upstream/pull/5144'
Tom Hughes [Sun, 1 Sep 2024 18:01:06 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5144'

3 months agoRemove unused user_diaries_tooltip locale string
Anton Khorev [Sun, 1 Sep 2024 16:13:26 +0000 (19:13 +0300)]
Remove unused user_diaries_tooltip locale string

3 months agoRemove unused locale strings for former changeset tables
Anton Khorev [Sun, 1 Sep 2024 15:54:23 +0000 (18:54 +0300)]
Remove unused locale strings for former changeset tables

3 months agoMerge branch 'pull/5142'
Anton Khorev [Sun, 1 Sep 2024 15:22:30 +0000 (18:22 +0300)]
Merge branch 'pull/5142'

3 months agoDrop unused oauth_10a_disabled translation
Tom Hughes [Sun, 1 Sep 2024 14:31:53 +0000 (15:31 +0100)]
Drop unused oauth_10a_disabled translation

3 months agoMerge remote-tracking branch 'upstream/pull/5140'
Tom Hughes [Sun, 1 Sep 2024 09:56:37 +0000 (10:56 +0100)]
Merge remote-tracking branch 'upstream/pull/5140'

3 months agoMerge remote-tracking branch 'upstream/pull/5139'
Tom Hughes [Sun, 1 Sep 2024 09:55:48 +0000 (10:55 +0100)]
Merge remote-tracking branch 'upstream/pull/5139'

3 months agoMerge remote-tracking branch 'upstream/pull/5138'
Tom Hughes [Sun, 1 Sep 2024 09:54:39 +0000 (10:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5138'