]> git.openstreetmap.org Git - rails.git/log
rails.git
47 hours agoMerge remote-tracking branch 'upstream/pull/5563' live
Tom Hughes [Tue, 28 Jan 2025 18:44:07 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5563'

47 hours agoMerge remote-tracking branch 'upstream/pull/5568'
Tom Hughes [Tue, 28 Jan 2025 18:30:19 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/5568'

47 hours agoMerge remote-tracking branch 'upstream/pull/5560'
Tom Hughes [Tue, 28 Jan 2025 18:26:24 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5560'

47 hours agoMerge remote-tracking branch 'upstream/pull/5566'
Tom Hughes [Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/5566'

47 hours agoMerge remote-tracking branch 'upstream/pull/5565'
Tom Hughes [Tue, 28 Jan 2025 18:21:47 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5565'

47 hours agoMerge remote-tracking branch 'upstream/pull/5564'
Tom Hughes [Tue, 28 Jan 2025 18:21:05 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5564'

47 hours agoUpdate bundle
Tom Hughes [Tue, 28 Jan 2025 18:09:48 +0000 (18:09 +0000)]
Update bundle

2 days agoRemoved author_{id, ip} methods from Note model
Nenad Vujicic [Tue, 28 Jan 2025 12:47:03 +0000 (13:47 +0100)]
Removed author_{id, ip} methods from Note model

Removed author_id, author_ip methods from Note model because they are not used anymore. Also, removed associated unit tests.

2 days agoMerge branch 'pull/5556'
Anton Khorev [Tue, 28 Jan 2025 05:31:21 +0000 (08:31 +0300)]
Merge branch 'pull/5556'

2 days agoRemove unused max_features parameter from feature warning
Anton Khorev [Tue, 28 Jan 2025 05:11:23 +0000 (08:11 +0300)]
Remove unused max_features parameter from feature warning

2 days agoRemove IE conditional compilation that limited max features
Anton Khorev [Tue, 28 Jan 2025 04:52:22 +0000 (07:52 +0300)]
Remove IE conditional compilation that limited max features

2 days agoBump coverallsapp/github-action from 2.3.5 to 2.3.6
dependabot[bot] [Mon, 27 Jan 2025 23:23:00 +0000 (23:23 +0000)]
Bump coverallsapp/github-action from 2.3.5 to 2.3.6

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.5...v2.3.6)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 days agoDataLayer to consume JSON format responses
mmd-osm [Mon, 27 Jan 2025 17:24:58 +0000 (18:24 +0100)]
DataLayer to consume JSON format responses

2 days agoMerge remote-tracking branch 'upstream/pull/5562'
Tom Hughes [Mon, 27 Jan 2025 19:25:50 +0000 (19:25 +0000)]
Merge remote-tracking branch 'upstream/pull/5562'

2 days agoMerge remote-tracking branch 'upstream/pull/5561'
Tom Hughes [Mon, 27 Jan 2025 19:24:07 +0000 (19:24 +0000)]
Merge remote-tracking branch 'upstream/pull/5561'

3 days agoIncrease the limit when a warning about a large number of objects is displayed.
Roman Deev [Mon, 27 Jan 2025 16:39:34 +0000 (19:39 +0300)]
Increase the limit when a warning about a large number of objects is displayed.

3 days agoClose button for loading error alert
Roman Deev [Mon, 27 Jan 2025 15:56:41 +0000 (18:56 +0300)]
Close button for loading error alert

3 days agoRemove layersAdded variable from map.updateLayers()
Anton Khorev [Mon, 27 Jan 2025 15:26:06 +0000 (18:26 +0300)]
Remove layersAdded variable from map.updateLayers()

3 days agoMerge branch 'pull/5474'
Anton Khorev [Mon, 27 Jan 2025 14:49:14 +0000 (17:49 +0300)]
Merge branch 'pull/5474'

3 days agoUse baselayerchange/overlaylayerchange instead of layeradd/layerremove for speed...
Roman Deev [Tue, 7 Jan 2025 00:17:24 +0000 (03:17 +0300)]
Use baselayerchange/overlaylayerchange instead of layeradd/layerremove for speed up Map Data layer render

3 days agoDrop IE specific favicon support
Tom Hughes [Sun, 26 Jan 2025 15:41:54 +0000 (15:41 +0000)]
Drop IE specific favicon support

3 days agoDrop ES6 polyfill
Tom Hughes [Sun, 26 Jan 2025 15:38:39 +0000 (15:38 +0000)]
Drop ES6 polyfill

3 days agoUpdate leaflet-osm to latest upstream version
Tom Hughes [Sun, 26 Jan 2025 19:36:15 +0000 (19:36 +0000)]
Update leaflet-osm to latest upstream version

4 days agoMerge remote-tracking branch 'upstream/pull/5551'
Tom Hughes [Sun, 26 Jan 2025 10:24:05 +0000 (10:24 +0000)]
Merge remote-tracking branch 'upstream/pull/5551'

4 days agoMerge remote-tracking branch 'upstream/pull/5538'
Tom Hughes [Sun, 26 Jan 2025 10:21:44 +0000 (10:21 +0000)]
Merge remote-tracking branch 'upstream/pull/5538'

4 days agoMerge remote-tracking branch 'upstream/pull/5536'
Tom Hughes [Sun, 26 Jan 2025 10:09:17 +0000 (10:09 +0000)]
Merge remote-tracking branch 'upstream/pull/5536'

4 days agoMerge remote-tracking branch 'upstream/pull/5553'
Tom Hughes [Sun, 26 Jan 2025 10:07:58 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5553'

4 days agoMerge remote-tracking branch 'upstream/pull/5552'
Tom Hughes [Sun, 26 Jan 2025 10:07:55 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5552'

5 days agoBump coverallsapp/github-action from 2.3.4 to 2.3.5
dependabot[bot] [Fri, 24 Jan 2025 23:53:28 +0000 (23:53 +0000)]
Bump coverallsapp/github-action from 2.3.4 to 2.3.5

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.4...v2.3.5)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoBump eslint from 9.18.0 to 9.19.0
dependabot[bot] [Fri, 24 Jan 2025 23:33:08 +0000 (23:33 +0000)]
Bump eslint from 9.18.0 to 9.19.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.18.0 to 9.19.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.18.0...v9.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoAdded error handling for data layer
mmd-osm [Fri, 24 Jan 2025 22:02:22 +0000 (23:02 +0100)]
Added error handling for data layer

6 days agoMerge remote-tracking branch 'upstream/pull/5545'
Tom Hughes [Fri, 24 Jan 2025 15:10:03 +0000 (15:10 +0000)]
Merge remote-tracking branch 'upstream/pull/5545'

6 days agoMerge remote-tracking branch 'upstream/pull/5544'
Tom Hughes [Fri, 24 Jan 2025 15:06:37 +0000 (15:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5544'

6 days agoMerge remote-tracking branch 'upstream/pull/5543'
Tom Hughes [Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)]
Merge remote-tracking branch 'upstream/pull/5543'

6 days agoMerge remote-tracking branch 'upstream/pull/5542'
Tom Hughes [Fri, 24 Jan 2025 14:59:54 +0000 (14:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5542'

6 days agoMerge remote-tracking branch 'upstream/pull/5548'
Tom Hughes [Fri, 24 Jan 2025 14:58:27 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5548'

6 days agoFix some eslint errors (quotes, spacing and parseInt radix) on .js.erb files
Andy Allan [Fri, 24 Jan 2025 14:22:06 +0000 (14:22 +0000)]
Fix some eslint errors (quotes, spacing and parseInt radix) on .js.erb files

These have been flagged by eslint-plugin-erb, and need to be fixed before
that plugin can be enabled.

6 days agoCreate api map resource
Anton Khorev [Fri, 24 Jan 2025 07:47:58 +0000 (10:47 +0300)]
Create api map resource

6 days agoSimplify write_notes scope check in api notes controller
Anton Khorev [Fri, 24 Jan 2025 03:16:11 +0000 (06:16 +0300)]
Simplify write_notes scope check in api notes controller

6 days agoMove scope_enabled? to ApiController
Anton Khorev [Fri, 24 Jan 2025 02:56:23 +0000 (05:56 +0300)]
Move scope_enabled? to ApiController

6 days agoRemove doorkeeper_token branch from web deny_access
Anton Khorev [Fri, 24 Jan 2025 02:28:46 +0000 (05:28 +0300)]
Remove doorkeeper_token branch from web deny_access

6 days agoRemove RuboCop action names exception for messages controller
Anton Khorev [Thu, 23 Jan 2025 01:20:09 +0000 (04:20 +0300)]
Remove RuboCop action names exception for messages controller

6 days agoCreate message mute resource
Anton Khorev [Thu, 23 Jan 2025 01:13:52 +0000 (04:13 +0300)]
Create message mute resource

6 days agoRemove unused css classes from inbox table
Anton Khorev [Thu, 23 Jan 2025 00:44:50 +0000 (03:44 +0300)]
Remove unused css classes from inbox table

6 days agoCreate message read_mark resource
Anton Khorev [Thu, 23 Jan 2025 00:41:19 +0000 (03:41 +0300)]
Create message read_mark resource

6 days agoMerge remote-tracking branch 'upstream/pull/5537'
Tom Hughes [Thu, 23 Jan 2025 18:14:09 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/5537'

6 days agoMerge remote-tracking branch 'upstream/pull/5541'
Tom Hughes [Thu, 23 Jan 2025 17:57:46 +0000 (17:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5541'

7 days agoAdd user transient attribute to oauth_access_grant factory
Anton Khorev [Thu, 23 Jan 2025 15:00:55 +0000 (18:00 +0300)]
Add user transient attribute to oauth_access_grant factory

7 days agoAdd user transient attribute to oauth_access_token factory
Anton Khorev [Thu, 23 Jan 2025 14:43:30 +0000 (17:43 +0300)]
Add user transient attribute to oauth_access_token factory

7 days agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Jan 2025 12:13:11 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

7 days agoInitialize I18n and OSM as soon as application.js loads
Anton Khorev [Thu, 23 Jan 2025 05:20:17 +0000 (08:20 +0300)]
Initialize I18n and OSM as soon as application.js loads

7 days agoCreate trace data resource
Anton Khorev [Thu, 23 Jan 2025 03:00:23 +0000 (06:00 +0300)]
Create trace data resource

7 days agoMerge remote-tracking branch 'upstream/pull/5533'
Tom Hughes [Wed, 22 Jan 2025 18:11:48 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5533'

7 days agoMerge remote-tracking branch 'upstream/pull/5535'
Tom Hughes [Wed, 22 Jan 2025 18:07:34 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5535'

7 days agoMerge remote-tracking branch 'upstream/pull/5529'
Tom Hughes [Wed, 22 Jan 2025 17:59:34 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5529'

7 days agoMerge remote-tracking branch 'upstream/pull/5532'
Tom Hughes [Wed, 22 Jan 2025 17:54:41 +0000 (17:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5532'

7 days agoMerge remote-tracking branch 'upstream/pull/5534'
Tom Hughes [Wed, 22 Jan 2025 17:50:31 +0000 (17:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5534'

8 days agoCreate changeset subscription resource
Anton Khorev [Wed, 22 Jan 2025 16:43:57 +0000 (19:43 +0300)]
Create changeset subscription resource

8 days agoUse flash.now for messages to be shown during this request
Andy Allan [Wed, 22 Jan 2025 13:55:30 +0000 (13:55 +0000)]
Use flash.now for messages to be shown during this request

8 days agoUse a custom cop to check controller action names
Andy Allan [Wed, 16 Oct 2024 18:49:22 +0000 (19:49 +0100)]
Use a custom cop to check controller action names

SpecificActionNames cop taken from https://github.com/rubocop/rubocop-rails/pull/827

8 days agoSet needs_view by default for new blocks
Anton Khorev [Tue, 21 Jan 2025 23:26:07 +0000 (02:26 +0300)]
Set needs_view by default for new blocks

8 days agoMerge branch 'pull/5531'
Anton Khorev [Tue, 21 Jan 2025 22:05:39 +0000 (01:05 +0300)]
Merge branch 'pull/5531'

8 days agoMerge branch 'pull/5530'
Anton Khorev [Tue, 21 Jan 2025 21:44:43 +0000 (00:44 +0300)]
Merge branch 'pull/5530'

8 days agoAdd indexes on user+id to changeset and diary comments
Tom Hughes [Tue, 21 Jan 2025 19:21:17 +0000 (19:21 +0000)]
Add indexes on user+id to changeset and diary comments

8 days agoPreload parent objects for user comments
Tom Hughes [Tue, 21 Jan 2025 19:03:03 +0000 (19:03 +0000)]
Preload parent objects for user comments

8 days agoMerge remote-tracking branch 'upstream/pull/5518'
Tom Hughes [Tue, 21 Jan 2025 18:44:31 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5518'

8 days agoMerge remote-tracking branch 'upstream/pull/5528'
Tom Hughes [Tue, 21 Jan 2025 18:26:47 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5528'

8 days agoUpdate bundle
Tom Hughes [Tue, 21 Jan 2025 18:08:49 +0000 (18:08 +0000)]
Update bundle

9 days agoConsistent usage of layer information in _osm_location cookie
mmd-osm [Tue, 21 Jan 2025 17:08:50 +0000 (18:08 +0100)]
Consistent usage of layer information in _osm_location cookie

Fixes #3971

9 days agoTest fallback locale on embed page
Anton Khorev [Mon, 20 Jan 2025 23:49:07 +0000 (02:49 +0300)]
Test fallback locale on embed page

9 days agoMerge branch 'pull/5527'
Anton Khorev [Mon, 20 Jan 2025 23:39:25 +0000 (02:39 +0300)]
Merge branch 'pull/5527'

9 days agoMerge pull request #5421 from tomhughes/ecma-version
Andy Allan [Mon, 20 Jan 2025 17:54:02 +0000 (17:54 +0000)]
Merge pull request #5421 from tomhughes/ecma-version

Bump allowed ECMAScript version to 2021 (ES12)

10 days agoEnable I18n fallback for the embed page
Tom Hughes [Mon, 20 Jan 2025 11:42:23 +0000 (11:42 +0000)]
Enable I18n fallback for the embed page

Fixes #5526.

11 days agoMerge remote-tracking branch 'upstream/pull/5520'
Tom Hughes [Sun, 19 Jan 2025 15:02:11 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5520'

11 days agoMerge remote-tracking branch 'upstream/pull/5517'
Tom Hughes [Sun, 19 Jan 2025 15:01:25 +0000 (15:01 +0000)]
Merge remote-tracking branch 'upstream/pull/5517'

11 days agoMerge remote-tracking branch 'upstream/pull/5516'
Tom Hughes [Sun, 19 Jan 2025 14:58:26 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5516'

11 days agoMerge remote-tracking branch 'upstream/pull/5515'
Tom Hughes [Sun, 19 Jan 2025 14:57:40 +0000 (14:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5515'

11 days agoInclude message_read attribute in api output of messages to self
Anton Khorev [Sun, 19 Jan 2025 02:48:36 +0000 (05:48 +0300)]
Include message_read attribute in api output of messages to self

11 days agoCreate changeset_comments resources for users
Anton Khorev [Sun, 19 Jan 2025 01:11:06 +0000 (04:11 +0300)]
Create changeset_comments resources for users

11 days agoCreate user comments controller base class
Anton Khorev [Sun, 19 Jan 2025 00:30:18 +0000 (03:30 +0300)]
Create user comments controller base class

11 days agoAdd tabbed navigation to user's diary comments page
Anton Khorev [Sat, 18 Jan 2025 23:58:56 +0000 (02:58 +0300)]
Add tabbed navigation to user's diary comments page

11 days agoCreate diary_comments resources for users
Anton Khorev [Sat, 18 Jan 2025 23:40:13 +0000 (02:40 +0300)]
Create diary_comments resources for users

11 days agoChange user's diary comments path to match model name
Anton Khorev [Sat, 18 Jan 2025 23:05:49 +0000 (02:05 +0300)]
Change user's diary comments path to match model name

11 days agoRename diary_comments_path to user_diary_comments_path
Anton Khorev [Sat, 18 Jan 2025 22:54:07 +0000 (01:54 +0300)]
Rename diary_comments_path to user_diary_comments_path

11 days agoSimplify diary_comments_path calls in tests
Anton Khorev [Sat, 18 Jan 2025 22:48:34 +0000 (01:48 +0300)]
Simplify diary_comments_path calls in tests

11 days agoCreate traces feed resource
Anton Khorev [Sat, 18 Jan 2025 20:01:47 +0000 (23:01 +0300)]
Create traces feed resource

11 days agoAdd regexp constraints to trace ids
Anton Khorev [Sat, 18 Jan 2025 19:37:37 +0000 (22:37 +0300)]
Add regexp constraints to trace ids

12 days agoUse resourceful routes for api tracepoints
Anton Khorev [Sat, 18 Jan 2025 17:08:07 +0000 (20:08 +0300)]
Use resourceful routes for api tracepoints

12 days agoReplace lookup_friend with lookup_user in FollowsController
Anton Khorev [Sat, 18 Jan 2025 16:35:30 +0000 (19:35 +0300)]
Replace lookup_friend with lookup_user in FollowsController

12 days agoMerge branch 'pull/5512'
Anton Khorev [Sat, 18 Jan 2025 15:23:51 +0000 (18:23 +0300)]
Merge branch 'pull/5512'

12 days agoMerge remote-tracking branch 'upstream/pull/5507'
Tom Hughes [Sat, 18 Jan 2025 12:06:58 +0000 (12:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5507'

12 days agoUse the dark version of TransportMap in dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:24 +0000 (21:16 +0100)]
Use the dark version of TransportMap in dark mode

12 days agoDisable dark mode filtering by default
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:21 +0000 (21:16 +0100)]
Disable dark mode filtering by default

12 days agoAllow map layers to specify an alternate tile set for dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:14 +0000 (21:16 +0100)]
Allow map layers to specify an alternate tile set for dark mode

12 days agoMerge remote-tracking branch 'upstream/pull/5513'
Tom Hughes [Sat, 18 Jan 2025 11:45:38 +0000 (11:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5513'

12 days agoMerge remote-tracking branch 'upstream/pull/5510'
Tom Hughes [Sat, 18 Jan 2025 11:41:08 +0000 (11:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5510'

12 days agoRemove "Public editing" line from settings page
Anton Khorev [Sat, 18 Jan 2025 00:32:57 +0000 (03:32 +0300)]
Remove "Public editing" line from settings page

12 days agoRename friends as followings
Tom Hughes [Fri, 17 Jan 2025 22:57:53 +0000 (22:57 +0000)]
Rename friends as followings

12 days agoRename friends rate limit as follows
Tom Hughes [Fri, 17 Jan 2025 22:56:48 +0000 (22:56 +0000)]
Rename friends rate limit as follows

12 days agoDrop rubocop exclusions that weren't doing anything
Tom Hughes [Fri, 17 Jan 2025 22:52:30 +0000 (22:52 +0000)]
Drop rubocop exclusions that weren't doing anything