]> git.openstreetmap.org Git - rails.git/log
rails.git
8 months agoMerge remote-tracking branch 'upstream/pull/4642'
Tom Hughes [Tue, 2 Apr 2024 17:24:50 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/4642'

8 months agoMerge remote-tracking branch 'upstream/pull/4643'
Tom Hughes [Tue, 2 Apr 2024 17:18:51 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/4643'

8 months agoMerge remote-tracking branch 'upstream/pull/4641'
Tom Hughes [Tue, 2 Apr 2024 17:13:57 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4641'

8 months agoUpdate bundle
Tom Hughes [Tue, 2 Apr 2024 16:45:56 +0000 (17:45 +0100)]
Update bundle

8 months agoChange revoke block buttons to danger style
Anton Khorev [Tue, 2 Apr 2024 15:35:18 +0000 (18:35 +0300)]
Change revoke block buttons to danger style

Because revoke buttons on block show pages are also danger buttons.

8 months agoMove edit/revoke block buttons to the bottom
Anton Khorev [Tue, 2 Apr 2024 15:17:14 +0000 (18:17 +0300)]
Move edit/revoke block buttons to the bottom

8 months agoRename api OldController to OldElementsController
Anton Khorev [Tue, 2 Apr 2024 13:11:09 +0000 (16:11 +0300)]
Rename api OldController to OldElementsController

8 months agoSimplify redact element paths in api tests
Anton Khorev [Tue, 2 Apr 2024 12:49:40 +0000 (15:49 +0300)]
Simplify redact element paths in api tests

8 months agoSimplify element history paths in api tests
Anton Khorev [Tue, 2 Apr 2024 12:28:49 +0000 (15:28 +0300)]
Simplify element history paths in api tests

8 months agoSimplify old element show paths in api tests
Anton Khorev [Tue, 2 Apr 2024 12:13:27 +0000 (15:13 +0300)]
Simplify old element show paths in api tests

8 months agoSimplify element show paths in api tests
Anton Khorev [Tue, 2 Apr 2024 11:53:17 +0000 (14:53 +0300)]
Simplify element show paths in api tests

8 months agoSimplify element multi fetch paths in api tests
Anton Khorev [Tue, 2 Apr 2024 11:36:29 +0000 (14:36 +0300)]
Simplify element multi fetch paths in api tests

8 months agoMerge remote-tracking branch 'upstream/pull/4637'
Tom Hughes [Mon, 1 Apr 2024 17:54:52 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4637'

8 months agoMerge remote-tracking branch 'upstream/pull/4640'
Tom Hughes [Mon, 1 Apr 2024 17:42:33 +0000 (18:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4640'

8 months agoMerge remote-tracking branch 'upstream/pull/4639'
Tom Hughes [Mon, 1 Apr 2024 17:37:27 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4639'

8 months agoMerge remote-tracking branch 'upstream/pull/4638'
Tom Hughes [Mon, 1 Apr 2024 17:19:45 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4638'

8 months agoMerge remote-tracking branch 'upstream/pull/4636'
Tom Hughes [Mon, 1 Apr 2024 17:18:32 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/4636'

8 months agoMerge remote-tracking branch 'upstream/pull/4635'
Tom Hughes [Mon, 1 Apr 2024 17:16:58 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4635'

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Apr 2024 12:19:34 +0000 (14:19 +0200)]
Localisation updates from https://translatewiki.net.

8 months agoRemove outdated comment
Anton Khorev [Sat, 30 Mar 2024 08:03:06 +0000 (11:03 +0300)]
Remove outdated comment

8 months agoRename update element consistency check
Anton Khorev [Sat, 30 Mar 2024 07:57:06 +0000 (10:57 +0300)]
Rename update element consistency check

8 months agoRefactor update element consistency check
Anton Khorev [Sat, 30 Mar 2024 07:38:57 +0000 (10:38 +0300)]
Refactor update element consistency check

8 months agoRename create element consistency check
Anton Khorev [Sat, 30 Mar 2024 07:13:24 +0000 (10:13 +0300)]
Rename create element consistency check

8 months agoRefactor create element consistency check
Anton Khorev [Sat, 30 Mar 2024 07:09:55 +0000 (10:09 +0300)]
Refactor create element consistency check

8 months agoRename api changesets index template
Anton Khorev [Sat, 30 Mar 2024 05:34:55 +0000 (08:34 +0300)]
Rename api changesets index template

8 months agoRename api changesets index action
Anton Khorev [Sat, 30 Mar 2024 05:26:58 +0000 (08:26 +0300)]
Rename api changesets index action

8 months agoRename api changeset show template
Anton Khorev [Sat, 30 Mar 2024 05:10:24 +0000 (08:10 +0300)]
Rename api changeset show template

Make template name correspond to action name.

8 months agoUse before/after pagination on users page
Anton Khorev [Fri, 29 Mar 2024 15:21:15 +0000 (18:21 +0300)]
Use before/after pagination on users page

8 months agoRemove unused user parameter for subscribe/unsubscribe headings
Anton Khorev [Fri, 29 Mar 2024 10:53:23 +0000 (13:53 +0300)]
Remove unused user parameter for subscribe/unsubscribe headings

8 months agoRedirect from old diary comments pagination
Anton Khorev [Fri, 29 Mar 2024 05:09:26 +0000 (08:09 +0300)]
Redirect from old diary comments pagination

8 months agoDrop redundant support for legacy trace files
Tom Hughes [Thu, 28 Mar 2024 17:27:28 +0000 (17:27 +0000)]
Drop redundant support for legacy trace files

8 months agoUse imported scope to simplify trace controller methods
Tom Hughes [Thu, 28 Mar 2024 17:26:04 +0000 (17:26 +0000)]
Use imported scope to simplify trace controller methods

8 months agoMerge remote-tracking branch 'upstream/pull/4632'
Tom Hughes [Thu, 28 Mar 2024 17:11:58 +0000 (17:11 +0000)]
Merge remote-tracking branch 'upstream/pull/4632'

8 months agoMerge remote-tracking branch 'upstream/pull/4631'
Tom Hughes [Thu, 28 Mar 2024 17:06:24 +0000 (17:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4631'

8 months agoMerge remote-tracking branch 'upstream/pull/4630'
Tom Hughes [Thu, 28 Mar 2024 17:06:06 +0000 (17:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4630'

8 months agoMerge remote-tracking branch 'upstream/pull/4628'
Tom Hughes [Thu, 28 Mar 2024 17:05:38 +0000 (17:05 +0000)]
Merge remote-tracking branch 'upstream/pull/4628'

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Mar 2024 12:18:19 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoRemove unused includes of ConsistencyValidations
Anton Khorev [Thu, 28 Mar 2024 08:49:49 +0000 (11:49 +0300)]
Remove unused includes of ConsistencyValidations

8 months agoRemove require "xml/libxml" from controllers
Anton Khorev [Thu, 28 Mar 2024 08:18:31 +0000 (11:18 +0300)]
Remove require "xml/libxml" from controllers

8 months agoFix module name of trace tests
Anton Khorev [Thu, 28 Mar 2024 05:42:01 +0000 (08:42 +0300)]
Fix module name of trace tests

8 months agoUse "visible" scope when finding traces
Anton Khorev [Wed, 27 Mar 2024 08:20:19 +0000 (11:20 +0300)]
Use "visible" scope when finding traces

Allows to eliminate some :not_found branches.

8 months agoMerge remote-tracking branch 'upstream/pull/4629'
Tom Hughes [Wed, 27 Mar 2024 17:58:46 +0000 (17:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4629'

8 months agoMove trace pictures/icons into their own controllers
Anton Khorev [Wed, 27 Mar 2024 10:25:28 +0000 (13:25 +0300)]
Move trace pictures/icons into their own controllers

8 months agoMerge remote-tracking branch 'upstream/pull/4625'
Tom Hughes [Tue, 26 Mar 2024 18:32:52 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4625'

8 months agoMerge remote-tracking branch 'upstream/pull/4626'
Tom Hughes [Tue, 26 Mar 2024 18:22:16 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4626'

8 months agoMerge remote-tracking branch 'upstream/pull/4622'
Tom Hughes [Tue, 26 Mar 2024 18:17:05 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/4622'

8 months agoMerge remote-tracking branch 'upstream/pull/4621'
Tom Hughes [Tue, 26 Mar 2024 18:14:04 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/4621'

8 months agoUpdate bundle
Tom Hughes [Tue, 26 Mar 2024 17:30:05 +0000 (17:30 +0000)]
Update bundle

8 months agoAdd links for admins from user page to user list filtered by ip/status
Anton Khorev [Tue, 26 Mar 2024 03:12:16 +0000 (06:12 +0300)]
Add links for admins from user page to user list filtered by ip/status

8 months agoAdd found users count to users page
Anton Khorev [Tue, 26 Mar 2024 02:19:46 +0000 (05:19 +0300)]
Add found users count to users page

8 months agoUse before/after pagination on users page
Anton Khorev [Tue, 26 Mar 2024 01:27:55 +0000 (04:27 +0300)]
Use before/after pagination on users page

8 months agoMake "include" and "limit" keyword args of pagination method
Anton Khorev [Tue, 26 Mar 2024 01:20:59 +0000 (04:20 +0300)]
Make "include" and "limit" keyword args of pagination method

8 months agoMove common pagination code to mixin
Anton Khorev [Thu, 14 Sep 2023 00:55:20 +0000 (03:55 +0300)]
Move common pagination code to mixin

8 months agoRemove assert_method from api controllers
Anton Khorev [Mon, 25 Mar 2024 04:15:16 +0000 (07:15 +0300)]
Remove assert_method from api controllers

8 months agoReplace lookup_user_by_id with load_resource
Anton Khorev [Mon, 25 Mar 2024 03:29:46 +0000 (06:29 +0300)]
Replace lookup_user_by_id with load_resource

8 months agoMerge remote-tracking branch 'upstream/pull/4619'
Tom Hughes [Sun, 24 Mar 2024 18:38:48 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4619'

8 months agoMerge remote-tracking branch 'upstream/pull/4620'
Tom Hughes [Sun, 24 Mar 2024 18:13:47 +0000 (18:13 +0000)]
Merge remote-tracking branch 'upstream/pull/4620'

8 months agoShorten note path helper calls in tests
Anton Khorev [Sun, 24 Mar 2024 14:19:05 +0000 (17:19 +0300)]
Shorten note path helper calls in tests

8 months agoReplace collection partial with single item in changeset comments feed
Anton Khorev [Sun, 24 Mar 2024 04:08:59 +0000 (07:08 +0300)]
Replace collection partial with single item in changeset comments feed

8 months agoMerge remote-tracking branch 'upstream/pull/4612'
Tom Hughes [Thu, 21 Mar 2024 17:25:41 +0000 (17:25 +0000)]
Merge remote-tracking branch 'upstream/pull/4612'

8 months agoSimplify and test downloaded changeset element sorting
Anton Khorev [Thu, 21 Mar 2024 17:02:18 +0000 (20:02 +0300)]
Simplify and test downloaded changeset element sorting

8 months agoMerge remote-tracking branch 'upstream/pull/4562'
Tom Hughes [Thu, 21 Mar 2024 16:38:18 +0000 (16:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4562'

8 months agoMerge remote-tracking branch 'upstream/pull/4609'
Tom Hughes [Thu, 21 Mar 2024 16:32:36 +0000 (16:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4609'

8 months agoMerge remote-tracking branch 'upstream/pull/4608'
Tom Hughes [Thu, 21 Mar 2024 16:30:21 +0000 (16:30 +0000)]
Merge remote-tracking branch 'upstream/pull/4608'

8 months agoSimplify remaining link_to ... user_path in views
Anton Khorev [Thu, 21 Mar 2024 15:07:56 +0000 (18:07 +0300)]
Simplify remaining link_to ... user_path in views

8 months agoSimplify links on diary pages
Anton Khorev [Thu, 21 Mar 2024 14:26:20 +0000 (17:26 +0300)]
Simplify links on diary pages

8 months agoMerge pull request #4602 from AntonKhorev/no-lego-trace-details
Andy Allan [Thu, 21 Mar 2024 14:01:13 +0000 (14:01 +0000)]
Merge pull request #4602 from AntonKhorev/no-lego-trace-details

Avoid lego translation in trace time/user/tags string

8 months agoMerge pull request #4607 from AntonKhorev/fix-traces-tabs
Andy Allan [Thu, 21 Mar 2024 14:00:41 +0000 (14:00 +0000)]
Merge pull request #4607 from AntonKhorev/fix-traces-tabs

Fix user's traces tab

8 months agoNest data-turbo="true" attributes in partials
Gregory Igelmund [Wed, 20 Mar 2024 19:17:39 +0000 (20:17 +0100)]
Nest data-turbo="true" attributes in partials

8 months agoRemove now-obsolete partials in app/views/messages/*
Gregory Igelmund [Wed, 6 Mar 2024 09:35:01 +0000 (10:35 +0100)]
Remove now-obsolete partials in app/views/messages/*

8 months agoapplication.js: Call updateHeader when turbo:render completed
Gregory Igelmund [Mon, 4 Mar 2024 14:54:38 +0000 (15:54 +0100)]
application.js: Call updateHeader when turbo:render completed

8 months agoEnable Turbo Drive with morphing for Messages#{destroy,mark}
Gregory Igelmund [Wed, 28 Feb 2024 15:20:24 +0000 (16:20 +0100)]
Enable Turbo Drive with morphing for Messages#{destroy,mark}

8 months agoGemfile: Add turbo-rails
Gregory Igelmund [Wed, 28 Feb 2024 15:05:01 +0000 (16:05 +0100)]
Gemfile: Add turbo-rails

8 months agoFix user's traces tab link
Anton Khorev [Thu, 21 Mar 2024 13:43:15 +0000 (16:43 +0300)]
Fix user's traces tab link

8 months agoChange user's traces tab label to a string without "GPX"
Anton Khorev [Thu, 21 Mar 2024 13:19:05 +0000 (16:19 +0300)]
Change user's traces tab label to a string without "GPX"

8 months agoMerge remote-tracking branch 'upstream/pull/4606'
Tom Hughes [Thu, 21 Mar 2024 12:58:29 +0000 (12:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4606'

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Mar 2024 12:19:52 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoReplace csp_meta_tag with `secure_headers` nonce
Gregory Igelmund [Thu, 21 Mar 2024 11:09:32 +0000 (12:09 +0100)]
Replace csp_meta_tag with `secure_headers` nonce

8 months agoMerge pull request #4604 from AntonKhorev/block-factory-revoked-expired
Andy Allan [Thu, 21 Mar 2024 10:43:00 +0000 (10:43 +0000)]
Merge pull request #4604 from AntonKhorev/block-factory-revoked-expired

Make factory-created revoked blocks inactive

8 months agoMake factory-created revoked blocks inactive
Anton Khorev [Thu, 21 Mar 2024 03:09:14 +0000 (06:09 +0300)]
Make factory-created revoked blocks inactive

8 months agoAvoid lego translation in trace time/user/tags string
Anton Khorev [Wed, 20 Mar 2024 22:34:46 +0000 (01:34 +0300)]
Avoid lego translation in trace time/user/tags string

8 months agoMerge remote-tracking branch 'upstream/pull/4600'
Tom Hughes [Wed, 20 Mar 2024 17:22:00 +0000 (17:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4600'

8 months agoMerge pull request #4599 from AntonKhorev/rename-messages-local
Andy Allan [Wed, 20 Mar 2024 17:20:57 +0000 (17:20 +0000)]
Merge pull request #4599 from AntonKhorev/rename-messages-local

Rename message local in message table partials

8 months agoMerge pull request #4598 from AntonKhorev/fix-trace-description
Andy Allan [Wed, 20 Mar 2024 17:11:37 +0000 (17:11 +0000)]
Merge pull request #4598 from AntonKhorev/fix-trace-description

Fix trace feed image urls and local variable names

8 months agoFix warning on unescaped hyphen in regexp
Andy Allan [Wed, 20 Mar 2024 17:05:28 +0000 (17:05 +0000)]
Fix warning on unescaped hyphen in regexp

8 months agoRename message local in message table partials
Anton Khorev [Wed, 20 Mar 2024 16:43:32 +0000 (19:43 +0300)]
Rename message local in message table partials

8 months agoRename trace local in trace description partial
Anton Khorev [Wed, 20 Mar 2024 15:49:10 +0000 (18:49 +0300)]
Rename trace local in trace description partial

8 months agoMerge pull request #4574 from urbalazs/wiki-prefixes-240313
Andy Allan [Wed, 20 Mar 2024 15:45:10 +0000 (15:45 +0000)]
Merge pull request #4574 from urbalazs/wiki-prefixes-240313

Add more wiki prefixes

8 months agoUse absolute paths to trace icon in traces feed
Anton Khorev [Wed, 20 Mar 2024 15:34:15 +0000 (18:34 +0300)]
Use absolute paths to trace icon in traces feed

8 months agoMerge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages
Andy Allan [Wed, 20 Mar 2024 14:44:42 +0000 (14:44 +0000)]
Merge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages

Simplify link_to user calls on block pages

8 months agoMerge pull request #4593 from AntonKhorev/simplify-link_to-on-issue-pages
Andy Allan [Wed, 20 Mar 2024 14:42:20 +0000 (14:42 +0000)]
Merge pull request #4593 from AntonKhorev/simplify-link_to-on-issue-pages

Simplify link_to user calls on issue pages

8 months agoMerge pull request #4594 from AntonKhorev/simplify-link_to-on-message-pages
Andy Allan [Wed, 20 Mar 2024 14:30:06 +0000 (14:30 +0000)]
Merge pull request #4594 from AntonKhorev/simplify-link_to-on-message-pages

Simplify link_to calls on message pages

8 months agoMerge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages
Andy Allan [Wed, 20 Mar 2024 12:01:26 +0000 (12:01 +0000)]
Merge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages

Simplify links on trace pages

8 months agoSimplify links on trace pages
Anton Khorev [Wed, 20 Mar 2024 03:07:24 +0000 (06:07 +0300)]
Simplify links on trace pages

8 months agoSimplify link_to calls on message pages
Anton Khorev [Wed, 20 Mar 2024 01:48:02 +0000 (04:48 +0300)]
Simplify link_to calls on message pages

8 months agoSimplify link_to user calls on issue pages
Anton Khorev [Wed, 20 Mar 2024 01:38:34 +0000 (04:38 +0300)]
Simplify link_to user calls on issue pages

8 months agoSimplify link_to user calls on block pages
Anton Khorev [Wed, 20 Mar 2024 01:27:58 +0000 (04:27 +0300)]
Simplify link_to user calls on block pages

8 months agoMerge remote-tracking branch 'upstream/pull/4591'
Tom Hughes [Tue, 19 Mar 2024 18:24:33 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/4591'

8 months agoUpdate bundle
Tom Hughes [Tue, 19 Mar 2024 18:09:05 +0000 (18:09 +0000)]
Update bundle

8 months agoShorten user path helper calls in tests
Anton Khorev [Tue, 19 Mar 2024 03:58:43 +0000 (06:58 +0300)]
Shorten user path helper calls in tests