]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 7 May 2022 07:16:12 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3544'
Tom Hughes [Sat, 7 May 2022 07:14:56 +0000 (08:14 +0100)]
Disable some Style/RedundantCondition corrections temporarily
https://github.com/rubocop/rubocop/issues/10605
Tom Hughes [Fri, 6 May 2022 23:33:04 +0000 (00:33 +0100)]
Update bundle
dependabot[bot] [Fri, 6 May 2022 23:01:09 +0000 (23:01 +0000)]
Bump eslint from 8.14.0 to 8.15.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.14.0 to 8.15.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/v8.14.0...v8.15.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 5 May 2022 11:12:22 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 4 May 2022 19:27:20 +0000 (20:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3542'
Harry Wood [Wed, 4 May 2022 15:34:40 +0000 (16:34 +0100)]
Report verification render not redirect
Fix an issue with the report verification, causing it to lose the text of a report if the user fails to fill in a category.
By using a `render` instead of a `redirect_to`, the rails standard verification behaviour works better. It means we also get a nice red "can't be blank" message highlighting the specific missing field.
Tom Hughes [Tue, 3 May 2022 18:09:31 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3539'
Tom Hughes [Tue, 3 May 2022 17:10:02 +0000 (18:10 +0100)]
Update bundle
translatewiki.net [Mon, 2 May 2022 11:11:33 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Harry Wood [Thu, 28 Apr 2022 23:52:21 +0000 (00:52 +0100)]
Add kramdown info box with preview button
Harry Wood [Thu, 28 Apr 2022 22:05:36 +0000 (23:05 +0100)]
Format report text with kramdown
Pass the text of reports ('details' field) through the RichText formatter to give us kramdown formatting support.
Harry Wood [Thu, 28 Apr 2022 21:32:44 +0000 (22:32 +0100)]
Add test of individual issue view with report
Add a test covering viewing an individual issue, a view which includes text of a report.
translatewiki.net [Thu, 28 Apr 2022 11:12:54 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 27 Apr 2022 15:29:54 +0000 (16:29 +0100)]
Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch
Meaningful and disambiguating class/type labels (from 2012)
Andy Allan [Wed, 27 Apr 2022 15:10:46 +0000 (16:10 +0100)]
Jesse Weinstein [Wed, 27 Apr 2022 14:14:26 +0000 (10:14 -0400)]
Apply the 4 suggestions from @gravitystorm
Tom Hughes [Wed, 27 Apr 2022 11:06:41 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3537'
Andy Allan [Wed, 27 Apr 2022 10:47:42 +0000 (11:47 +0100)]
Rework common details to avoid awkward line breaks
Fixes #3435
Also brings the location information into the list, which avoids a
lack of padding before the next header.
Tom Hughes [Tue, 26 Apr 2022 21:59:54 +0000 (22:59 +0100)]
Update to rails 7.0.2.4
Tom Hughes [Tue, 26 Apr 2022 17:10:52 +0000 (18:10 +0100)]
Fix new rubocopy warnings
Tom Hughes [Tue, 26 Apr 2022 17:08:39 +0000 (18:08 +0100)]
Update bundle
translatewiki.net [Mon, 25 Apr 2022 11:13:22 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
Jesse Weinstein [Mon, 25 Apr 2022 02:06:10 +0000 (22:06 -0400)]
Merge branch 'master' into HEAD
Tom Hughes [Fri, 22 Apr 2022 23:05:41 +0000 (00:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3534'
dependabot[bot] [Fri, 22 Apr 2022 23:01:01 +0000 (23:01 +0000)]
Bump eslint from 8.13.0 to 8.14.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.13.0 to 8.14.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/v8.13.0...v8.14.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 21 Apr 2022 11:25:59 +0000 (12:25 +0100)]
Cancel workflow runs which get superseded automatically
translatewiki.net [Thu, 21 Apr 2022 11:12:18 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 18 Apr 2022 13:23:02 +0000 (14:23 +0100)]
Fix eslint warning
Tom Hughes [Mon, 18 Apr 2022 13:13:52 +0000 (14:13 +0100)]
Update bundle
Tom Hughes [Mon, 18 Apr 2022 13:10:06 +0000 (14:10 +0100)]
Update to leaflet 1.8.0
translatewiki.net [Mon, 18 Apr 2022 11:11:49 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Apr 2022 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 12 Apr 2022 16:12:16 +0000 (17:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3523'
Tom Hughes [Tue, 12 Apr 2022 15:59:13 +0000 (16:59 +0100)]
Update bundle
Tom Hughes [Mon, 11 Apr 2022 19:47:52 +0000 (20:47 +0100)]
Check API status before authorizing access
Fixes #3530
Tom Hughes [Mon, 11 Apr 2022 19:28:11 +0000 (20:28 +0100)]
Make database_offline mode work
Fixes #3529
translatewiki.net [Mon, 11 Apr 2022 11:12:35 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 9 Apr 2022 22:29:19 +0000 (23:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3526'
hlfan [Sat, 9 Apr 2022 20:28:01 +0000 (22:28 +0200)]
variant B
Reducing regex complexity and broadening the domain match
dependabot[bot] [Fri, 8 Apr 2022 23:00:43 +0000 (23:00 +0000)]
Bump eslint from 8.12.0 to 8.13.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.12.0 to 8.13.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/v8.12.0...v8.13.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 7 Apr 2022 11:11:20 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 6 Apr 2022 17:04:17 +0000 (18:04 +0100)]
Merge pull request #3495 from mmd-osm/patch/json_cs
JSON output added to changeset(s) endpoints
Andy Allan [Wed, 6 Apr 2022 13:55:29 +0000 (14:55 +0100)]
Rubocop autofix: ambiguous operator precedence
This simply adds braces to clarify which mathematical operator comes
first.
Tom Hughes [Mon, 4 Apr 2022 17:14:07 +0000 (18:14 +0100)]
Update bundle
translatewiki.net [Mon, 4 Apr 2022 11:11:36 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 31 Mar 2022 11:12:25 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 30 Mar 2022 22:59:40 +0000 (23:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3520'
dependabot[bot] [Wed, 30 Mar 2022 22:17:25 +0000 (22:17 +0000)]
Bump puma from 5.6.2 to 5.6.4
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [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.2...v5.6.4)
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 30 Mar 2022 21:26:39 +0000 (22:26 +0100)]
Uniqify counts for containing ways and relations on browse pages
Fixes #3519
Tom Hughes [Wed, 30 Mar 2022 17:00:00 +0000 (18:00 +0100)]
Merge remote-tracking branch 'upstream/pull/3518'
Andy Allan [Wed, 30 Mar 2022 16:15:11 +0000 (17:15 +0100)]
Use factories for tag uniqueness tests
Andy Allan [Wed, 23 Feb 2022 11:44:56 +0000 (11:44 +0000)]
Simplify changeset tag tests by using factories
This saves lots of boilerplate in creating a valid test object
Andy Allan [Wed, 23 Feb 2022 11:37:09 +0000 (11:37 +0000)]
Rework 'empty' tag tests
These tests were checking that the parent object was set, but this
was not obvious from the way that the tests were named and constructed.
This refactoring makes it clearer what is being checked.
Andy Allan [Wed, 30 Mar 2022 15:25:48 +0000 (16:25 +0100)]
Merge pull request #3516 from danieldegroot2/wiki
Add initial capital letter
Tom Hughes [Tue, 29 Mar 2022 16:54:23 +0000 (17:54 +0100)]
Update bundle
danieldegroot2 [Mon, 28 Mar 2022 16:36:22 +0000 (18:36 +0200)]
Add initial capital letter
translatewiki.net [Mon, 28 Mar 2022 11:13:01 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
hlfan [Sat, 26 Mar 2022 01:02:32 +0000 (02:02 +0100)]
google imagery blacklist entry update
Updated google imagery blacklist entry to include the pb implementation of the vt endpoint for URLs like these:
https://www.google.at/maps/vt?pb=!1m4!1m3!1e{z}!2i{x}!3u{y}!2m2!1e1!2sm!3b0
Tom Hughes [Fri, 25 Mar 2022 23:53:32 +0000 (23:53 +0000)]
Merge remote-tracking branch 'upstream/pull/3511'
dependabot[bot] [Fri, 25 Mar 2022 23:00:55 +0000 (23:00 +0000)]
Bump eslint from 8.11.0 to 8.12.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.12.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/v8.11.0...v8.12.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Andy Allan [Thu, 24 Mar 2022 11:55:48 +0000 (11:55 +0000)]
Merge pull request #3510 from danieldegroot2/aid-school
Add initial capital letters for Nominatim
Andy Allan [Thu, 24 Mar 2022 11:55:35 +0000 (11:55 +0000)]
Merge pull request #3508 from danieldegroot2/sportsclub
Change spelling for club=sport
danieldegroot2 [Thu, 24 Mar 2022 10:49:22 +0000 (11:49 +0100)]
Add initial capital letters for Nominatim
danieldegroot2 [Wed, 23 Mar 2022 12:00:25 +0000 (13:00 +0100)]
Change spelling for club=sport
Tom Hughes [Tue, 22 Mar 2022 17:41:15 +0000 (17:41 +0000)]
Re-enable the Rails/MigrationClassName cop
Tom Hughes [Tue, 22 Mar 2022 17:40:24 +0000 (17:40 +0000)]
Update bundle
Andy Allan [Tue, 22 Mar 2022 17:53:11 +0000 (17:53 +0000)]
Merge pull request #3506 from danieldegroot2/website
Make spelling for "website" consistent
danieldegroot2 [Tue, 22 Mar 2022 09:42:29 +0000 (10:42 +0100)]
Update spelling for "website" to current standard
Removed redundant space in "web site".
Tom Hughes [Mon, 21 Mar 2022 23:56:41 +0000 (23:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3505'
dependabot[bot] [Mon, 21 Mar 2022 23:06:12 +0000 (23:06 +0000)]
Bump actions/cache from 2.1.7 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.7...v3)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 21 Mar 2022 12:12:36 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 18 Mar 2022 19:35:50 +0000 (19:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3503'
mxdanger [Thu, 17 Mar 2022 23:25:17 +0000 (16:25 -0700)]
Fix SVG query icon font
translatewiki.net [Thu, 17 Mar 2022 12:12:39 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 15 Mar 2022 18:24:32 +0000 (18:24 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 15 Mar 2022 18:24:23 +0000 (18:24 +0000)]
Disable broken cop
https://github.com/rubocop/rubocop-rails/issues/659
Tom Hughes [Tue, 15 Mar 2022 18:25:20 +0000 (18:25 +0000)]
Update bundle
mmd-osm [Wed, 9 Mar 2022 19:02:17 +0000 (20:02 +0100)]
JSON output added to changeset(s) endpoints
translatewiki.net [Mon, 14 Mar 2022 12:12:25 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 12 Mar 2022 00:31:03 +0000 (00:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3496'
dependabot[bot] [Fri, 11 Mar 2022 23:01:07 +0000 (23:01 +0000)]
Bump eslint from 8.10.0 to 8.11.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.10.0 to 8.11.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/v8.10.0...v8.11.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 10 Mar 2022 12:12:37 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Mar 2022 22:43:02 +0000 (22:43 +0000)]
Mark redirects which need to be open with allow_other_host
Tom Hughes [Wed, 9 Mar 2022 18:58:54 +0000 (18:58 +0000)]
Merge pull request #3486 from tomhughes/vips
Switch to using vips for image processing
Andy Allan [Wed, 9 Mar 2022 18:16:51 +0000 (18:16 +0000)]
Add vips to brew install list
Andy Allan [Wed, 9 Mar 2022 17:18:43 +0000 (17:18 +0000)]
Remove imagemagick from dependencies
Andy Allan [Wed, 9 Mar 2022 17:10:40 +0000 (17:10 +0000)]
Merge pull request #3491 from tomhughes/legacy-trace
Remove support for legacy trace files
Andy Allan [Wed, 9 Mar 2022 17:04:37 +0000 (17:04 +0000)]
Merge pull request #3492 from harry-wood/oauth-doc
OAuth updates to CONFIGURE doc + cosmetic tweak
Tom Hughes [Tue, 8 Mar 2022 20:30:19 +0000 (20:30 +0000)]
Merge remote-tracking branch 'upstream/pull/3493'
Tom Hughes [Tue, 8 Mar 2022 20:25:49 +0000 (20:25 +0000)]
Update to rails 7.0.2.3
mmd-osm [Tue, 8 Mar 2022 19:21:35 +0000 (20:21 +0100)]
JSON output added to permissions endpoint
Tom Hughes [Tue, 8 Mar 2022 19:10:05 +0000 (19:10 +0000)]
Fix some Naming/AccessorMethodName rubocop warnings
Tom Hughes [Tue, 8 Mar 2022 18:51:39 +0000 (18:51 +0000)]
Fix Lint/DuplicateBranch rubocop warnings
Tom Hughes [Tue, 8 Mar 2022 18:21:32 +0000 (18:21 +0000)]
Update bundle
Harry Wood [Tue, 8 Mar 2022 12:34:27 +0000 (12:34 +0000)]
Make oauth register app link into button
Cosmetic tweak. On the OAuth 1 setting tab, make "Register your app" into a button not a link
Also put the applications in a <ul>
Harry Wood [Thu, 24 Feb 2022 10:19:48 +0000 (10:19 +0000)]
Update CONFIGURE instructions for oauth
Update the instructions in CONFIGURE.md on how to set-up the built-in apps. Need to clarify that iD is on OAuth1, which is a little different from the 'web site' (Notes) set-up on OAuth2. Also iD requires more permissions these days.
translatewiki.net [Mon, 7 Mar 2022 12:11:39 +0000 (13:11 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 5 Mar 2022 10:08:53 +0000 (10:08 +0000)]
Merge remote-tracking branch 'upstream/pull/3489'
Harry Wood [Sat, 5 Mar 2022 01:53:07 +0000 (01:53 +0000)]
More readable multi-line ruby in erbs
A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.