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

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

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

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

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

2 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

2 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

2 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

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

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

2 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

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

2 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

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

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

2 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

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

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

2 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

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

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

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

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

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

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

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

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

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

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

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

2 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`

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

2 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

2 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

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

2 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

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

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

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

2 months agoMerge remote-tracking branch 'upstream/pull/5137'
Tom Hughes [Sun, 1 Sep 2024 09:53:44 +0000 (10:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5137'

2 months agoMerge remote-tracking branch 'upstream/pull/5136'
Tom Hughes [Sun, 1 Sep 2024 09:53:04 +0000 (10:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5136'

2 months agoMerge remote-tracking branch 'upstream/pull/5135'
Tom Hughes [Sun, 1 Sep 2024 09:51:50 +0000 (10:51 +0100)]
Merge remote-tracking branch 'upstream/pull/5135'

2 months agoMerge branch 'drop-oauth1'
Anton Khorev [Sun, 1 Sep 2024 00:46:23 +0000 (03:46 +0300)]
Merge branch 'drop-oauth1'

2 months agoDrop support for OAuth 1
Tom Hughes [Wed, 24 Jul 2024 18:12:14 +0000 (19:12 +0100)]
Drop support for OAuth 1

2 months agoRemove unused donation strings
Anton Khorev [Sat, 31 Aug 2024 23:46:32 +0000 (02:46 +0300)]
Remove unused donation strings

2 months agoRemove unused no_iframe_support message
Anton Khorev [Sat, 31 Aug 2024 23:32:46 +0000 (02:32 +0300)]
Remove unused no_iframe_support message

2 months agoRemove unused fail locale strings from user role grant/revoke
Anton Khorev [Sat, 31 Aug 2024 23:18:13 +0000 (02:18 +0300)]
Remove unused fail locale strings from user role grant/revoke

2 months agoRemove unused not_an_admin locale string
Anton Khorev [Sat, 31 Aug 2024 22:49:05 +0000 (01:49 +0300)]
Remove unused not_an_admin locale string

2 months agoRemove unused reference to missing gps layer name
Anton Khorev [Sat, 31 Aug 2024 22:17:12 +0000 (01:17 +0300)]
Remove unused reference to missing gps layer name

2 months agoFix page title for failed trace updates
Anton Khorev [Sat, 31 Aug 2024 16:13:27 +0000 (19:13 +0300)]
Fix page title for failed trace updates

2 months agoMerge remote-tracking branch 'upstream/pull/5133'
Tom Hughes [Fri, 30 Aug 2024 16:46:00 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/5133'

2 months agoTest oauth2 application list with moderator permission icon
Anton Khorev [Fri, 30 Aug 2024 16:29:02 +0000 (19:29 +0300)]
Test oauth2 application list with moderator permission icon

2 months agoCompacted repeated "Results" into one sentence
Nenad Vujicic [Fri, 23 Aug 2024 12:59:04 +0000 (14:59 +0200)]
Compacted repeated "Results" into one sentence

Fixes #5065. Removed "Results from" from search results.

2 months agoMerge branch 'pull/5129'
Anton Khorev [Thu, 29 Aug 2024 15:58:45 +0000 (18:58 +0300)]
Merge branch 'pull/5129'

2 months agoDecrease number of issues in pagination test
Anton Khorev [Thu, 29 Aug 2024 15:57:27 +0000 (18:57 +0300)]
Decrease number of issues in pagination test

2 months agoTest failures on issues pagination
nertc [Thu, 29 Aug 2024 13:07:05 +0000 (17:07 +0400)]
Test failures on issues pagination

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Aug 2024 12:13:43 +0000 (14:13 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoMerge remote-tracking branch 'upstream/pull/5126'
Tom Hughes [Wed, 28 Aug 2024 18:03:53 +0000 (19:03 +0100)]
Merge remote-tracking branch 'upstream/pull/5126'

2 months agoMerge remote-tracking branch 'upstream/pull/4565'
Tom Hughes [Wed, 28 Aug 2024 17:59:09 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4565'

2 months agoMerge pull request #5124 from tomhughes/turbo-issue-search
Andy Allan [Wed, 28 Aug 2024 17:52:10 +0000 (18:52 +0100)]
Merge pull request #5124 from tomhughes/turbo-issue-search

Use turbo to update issue search results

2 months agoMerge remote-tracking branch 'upstream/pull/5120'
Tom Hughes [Wed, 28 Aug 2024 17:38:34 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5120'

2 months agoRename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController
Andy Allan [Wed, 28 Aug 2024 17:18:26 +0000 (18:18 +0100)]
Rename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController

We usually create nested controllers with the main controller as the module,
and the nested controller as the specialization, e.g. Users::DeletionsController
or Traces::IconsController.

This then leaves the topic of whether the feed resource is plural, and whether we
are then showing a singular feed or showing a list (index) of objects.

The routes are carefully named so that we have `changesets_comments_feed_path` (the
comments feed for all changesets) vs `changeset_comment_feed_path(changeset)` (the
comments for a singular changeset).

2 months agoMerge pull request #4587 from AntonKhorev/changeset-comment-routes
Andy Allan [Wed, 28 Aug 2024 17:30:11 +0000 (18:30 +0100)]
Merge pull request #4587 from AntonKhorev/changeset-comment-routes

Move changeset comments feed to resourceful routes

2 months agoMerge pull request #5093 from AntonKhorev/diary-comments-shallow-paths
Andy Allan [Wed, 28 Aug 2024 13:58:53 +0000 (14:58 +0100)]
Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths

Use shallow routes for diary comments

2 months agoMerge pull request #5034 from grischard/patch-4
Andy Allan [Wed, 28 Aug 2024 13:55:36 +0000 (14:55 +0100)]
Merge pull request #5034 from grischard/patch-4

Add planet link and explanation to robots.txt

2 months agoMerge pull request #5060 from tomhughes/rake-expiry
Andy Allan [Wed, 28 Aug 2024 13:54:31 +0000 (14:54 +0100)]
Merge pull request #5060 from tomhughes/rake-expiry

Move token expiry to a rake task

2 months agoAllowed sending follow-ups for sent messages
Nenad Vujicic [Thu, 22 Aug 2024 21:37:39 +0000 (23:37 +0200)]
Allowed sending follow-ups for sent messages

Fixes #3497. Adds Reply button when displaying sent messages (app/views/messages/show.html.erb) and allows replying to messages for which sender is current user (app/controllers/messages_controller.rb). Improved tests for testing added functionality.

2 months agoUse turbo to update issue search results
Tom Hughes [Tue, 27 Aug 2024 18:19:49 +0000 (19:19 +0100)]
Use turbo to update issue search results

2 months agoMerge remote-tracking branch 'upstream/pull/5057'
Tom Hughes [Tue, 27 Aug 2024 18:07:47 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/5057'

2 months agoUpdate rubocop todo
Tom Hughes [Tue, 27 Aug 2024 18:03:43 +0000 (19:03 +0100)]
Update rubocop todo

2 months agoUpdate bundle
Tom Hughes [Tue, 27 Aug 2024 16:47:47 +0000 (17:47 +0100)]
Update bundle

2 months agoAdd turbo to Issues page
nertc [Tue, 27 Aug 2024 07:50:43 +0000 (11:50 +0400)]
Add turbo to Issues page

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

2 months agoAdd pagination to Issues page
nertc [Mon, 19 Aug 2024 18:09:06 +0000 (22:09 +0400)]
Add pagination to Issues page

2 months agoMerge remote-tracking branch 'upstream/pull/5113'
Tom Hughes [Sun, 25 Aug 2024 16:27:37 +0000 (17:27 +0100)]
Merge remote-tracking branch 'upstream/pull/5113'

3 months agoBump eslint from 9.9.0 to 9.9.1
dependabot[bot] [Fri, 23 Aug 2024 23:46:41 +0000 (23:46 +0000)]
Bump eslint from 9.9.0 to 9.9.1

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

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

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoMerge remote-tracking branch 'upstream/pull/5106'
Tom Hughes [Fri, 23 Aug 2024 17:27:10 +0000 (18:27 +0100)]
Merge remote-tracking branch 'upstream/pull/5106'

3 months agoBackfill block deactivates_at
Anton Khorev [Thu, 22 Aug 2024 12:45:59 +0000 (15:45 +0300)]
Backfill block deactivates_at

3 months agoMerge remote-tracking branch 'upstream/pull/5110'
Tom Hughes [Fri, 23 Aug 2024 17:09:21 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/5110'

3 months agoMerge remote-tracking branch 'upstream/pull/5111'
Tom Hughes [Fri, 23 Aug 2024 17:01:27 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5111'

3 months agoMerge remote-tracking branch 'upstream/pull/5107'
Tom Hughes [Fri, 23 Aug 2024 16:48:48 +0000 (17:48 +0100)]
Merge remote-tracking branch 'upstream/pull/5107'

3 months agoMove changeset comment feeds to resourceful routes
Anton Khorev [Fri, 23 Aug 2024 15:14:19 +0000 (18:14 +0300)]
Move changeset comment feeds to resourceful routes

3 months agoMove changeset comments controller to feeds module
Anton Khorev [Fri, 23 Aug 2024 14:40:26 +0000 (17:40 +0300)]
Move changeset comments controller to feeds module

3 months agoDisable turbo on all links inside pagination frames except older/newer
Anton Khorev [Fri, 23 Aug 2024 12:00:55 +0000 (15:00 +0300)]
Disable turbo on all links inside pagination frames except older/newer

3 months agoRemove revoke block action
Anton Khorev [Fri, 23 Aug 2024 10:34:08 +0000 (13:34 +0300)]
Remove revoke block action

3 months agoRemove revoke block pages
Anton Khorev [Fri, 23 Aug 2024 10:23:29 +0000 (13:23 +0300)]
Remove revoke block pages

3 months agoUpdate block-api integration test to revoke block by editing
Anton Khorev [Fri, 23 Aug 2024 10:11:32 +0000 (13:11 +0300)]
Update block-api integration test to revoke block by editing

3 months agoRemove revoke buttons from block show pages
Anton Khorev [Fri, 23 Aug 2024 10:01:20 +0000 (13:01 +0300)]
Remove revoke buttons from block show pages

3 months agoRemove revoke buttons from block lists
Anton Khorev [Fri, 23 Aug 2024 09:55:53 +0000 (12:55 +0300)]
Remove revoke buttons from block lists

3 months agoStop testing revoke block buttons
Anton Khorev [Fri, 23 Aug 2024 09:55:20 +0000 (12:55 +0300)]
Stop testing revoke block buttons

3 months agoUpdate bundle
Tom Hughes [Thu, 22 Aug 2024 21:18:32 +0000 (22:18 +0100)]
Update bundle

3 months agoMerge remote-tracking branch 'upstream/pull/5104'
Tom Hughes [Thu, 22 Aug 2024 17:06:09 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5104'

3 months agoConvert dashboard test into a system test
Anton Khorev [Thu, 22 Aug 2024 14:47:26 +0000 (17:47 +0300)]
Convert dashboard test into a system test

Allows to remove an id used only for testing.

3 months agoChange dashboard heading levels
Anton Khorev [Thu, 22 Aug 2024 14:42:24 +0000 (17:42 +0300)]
Change dashboard heading levels

3 months agoRemove outdated test for friends in users controller
Anton Khorev [Thu, 22 Aug 2024 14:41:50 +0000 (17:41 +0300)]
Remove outdated test for friends in users controller

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Aug 2024 12:19:11 +0000 (14:19 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoChange submit button on block edit page when can only revoke
Anton Khorev [Wed, 21 Aug 2024 14:07:40 +0000 (17:07 +0300)]
Change submit button on block edit page when can only revoke

3 months agoRemove duration controls for blocks that can only be revoked by editing
Anton Khorev [Wed, 21 Aug 2024 13:58:34 +0000 (16:58 +0300)]
Remove duration controls for blocks that can only be revoked by editing

3 months agoLet all moderators revoke blocks by editing
Anton Khorev [Wed, 21 Aug 2024 13:51:19 +0000 (16:51 +0300)]
Let all moderators revoke blocks by editing

3 months agoShow edit buttons on active blocks to all moderators
Anton Khorev [Thu, 22 Aug 2024 09:56:15 +0000 (12:56 +0300)]
Show edit buttons on active blocks to all moderators