]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 30 Jul 2023 17:31:43 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4116'
dependabot[bot] [Fri, 28 Jul 2023 23:15:35 +0000 (23:15 +0000)]
Bump eslint from 8.45.0 to 8.46.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.46.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.45.0...v8.46.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, 27 Jul 2023 19:42:03 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4108'
Tom Hughes [Thu, 27 Jul 2023 19:30:15 +0000 (20:30 +0100)]
Improve testing of paged access to trace lists
Tom Hughes [Thu, 27 Jul 2023 19:29:29 +0000 (20:29 +0100)]
Disambiguate ID queries for tagged trace lists
Andy Allan [Wed, 26 Jul 2023 16:39:36 +0000 (17:39 +0100)]
Simplify menu-icon css
Remove the duplicate display property, since it was force-overridden
by the `!important` keyword in the same definiton. This then makes the
`!important` keywords unnecessary. The menu-icon is floated, and
therefore can't be `inline-block`, so browsers were interpreting that
as `block` all along.
Andy Allan [Wed, 26 Jul 2023 16:39:12 +0000 (17:39 +0100)]
Remove unused parameter
Andy Allan [Wed, 26 Jul 2023 16:11:58 +0000 (17:11 +0100)]
Andy Allan [Wed, 26 Jul 2023 15:45:00 +0000 (16:45 +0100)]
Merge pull request #3933 from AntonKhorev/api-changesets-limit
Add limit parameter to api changesets query
Andy Allan [Wed, 26 Jul 2023 15:21:22 +0000 (16:21 +0100)]
Merge pull request #4089 from tomhughes/trace-paging
Replace page numbers with ID based selection for trace indexes
Tom Hughes [Tue, 25 Jul 2023 17:10:53 +0000 (18:10 +0100)]
Update bundle
translatewiki.net [Mon, 24 Jul 2023 11:18:53 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Jul 2023 18:42:29 +0000 (19:42 +0100)]
Replace page numbers with ID based selection for trace indexes
translatewiki.net [Thu, 20 Jul 2023 11:15:14 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 18 Jul 2023 17:27:06 +0000 (18:27 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 18 Jul 2023 17:25:12 +0000 (18:25 +0100)]
Update bundle
Tom Hughes [Sun, 16 Jul 2023 11:07:00 +0000 (12:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4097'
Tom Hughes [Sun, 16 Jul 2023 11:06:57 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4095'
Tom Hughes [Sun, 16 Jul 2023 11:06:54 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4094'
Amir E. Aharoni [Sat, 15 Jul 2023 07:34:24 +0000 (10:34 +0300)]
Consistent plural forms for browse.way.nodes_count
Without this, translatewiki's validator shows an error for English.
dependabot[bot] [Fri, 14 Jul 2023 23:02:08 +0000 (23:02 +0000)]
Bump eslint from 8.44.0 to 8.45.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.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.44.0...v8.45.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 13 Jul 2023 23:19:20 +0000 (23:19 +0000)]
Bump coverallsapp/github-action from 2.2.0 to 2.2.1
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.0...v2.2.1)
---
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>
Tom Hughes [Thu, 13 Jul 2023 19:13:29 +0000 (20:13 +0100)]
Remove default imagery blacklist
Tom Hughes [Thu, 13 Jul 2023 17:36:24 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4093'
Pavel Zbytovský [Thu, 13 Jul 2023 17:04:24 +0000 (19:04 +0200)]
Block mapy.cz as non-approved imagery
Issue: https://github.com/openstreetmap/openstreetmap-website/issues/4085
Tom Hughes [Thu, 13 Jul 2023 12:25:56 +0000 (13:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4092'
Martin Raifer [Thu, 13 Jul 2023 12:04:21 +0000 (14:04 +0200)]
Update to iD v2.26.2
translatewiki.net [Thu, 13 Jul 2023 11:19:25 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 13 Jul 2023 07:03:52 +0000 (08:03 +0100)]
Merge remote-tracking branch 'upstream/pull/4091'
dependabot[bot] [Wed, 12 Jul 2023 23:58:30 +0000 (23:58 +0000)]
Bump osm-community-index from 5.5.3 to 5.5.4
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.3...v5.5.4)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 12 Jul 2023 20:57:17 +0000 (21:57 +0100)]
Merge remote-tracking branch 'upstream/pull/4090'
Martin Raifer [Wed, 12 Jul 2023 20:19:43 +0000 (22:19 +0200)]
Update to iD v2.26.1
Tom Hughes [Wed, 12 Jul 2023 17:34:56 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4088'
Tom Hughes [Wed, 12 Jul 2023 17:26:25 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4086'
Andy Allan [Wed, 12 Jul 2023 16:46:01 +0000 (17:46 +0100)]
Avoid using sprockets for combining stylesheets
There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).
This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+
See https://github.com/sass/sassc-rails/issues/174
Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.
* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422
Martin Raifer [Wed, 12 Jul 2023 11:57:19 +0000 (13:57 +0200)]
Update to iD v2.26.0
Tom Hughes [Tue, 11 Jul 2023 17:16:45 +0000 (18:16 +0100)]
Update bundle
translatewiki.net [Mon, 10 Jul 2023 11:33:02 +0000 (13:33 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 6 Jul 2023 21:16:03 +0000 (22:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4078'
dependabot[bot] [Thu, 6 Jul 2023 20:04:31 +0000 (20:04 +0000)]
Bump sanitize from 6.0.1 to 6.0.2
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)
---
updated-dependencies:
- dependency-name: sanitize
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 6 Jul 2023 11:20:58 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 5 Jul 2023 14:10:12 +0000 (15:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4077'
Tom Hughes [Wed, 5 Jul 2023 14:01:12 +0000 (15:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4076'
Andy Allan [Wed, 5 Jul 2023 13:42:07 +0000 (14:42 +0100)]
Avoid using the zero key for pluralisation in English
This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.
An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.
Fixes #3997
Andy Allan [Wed, 5 Jul 2023 12:47:12 +0000 (13:47 +0100)]
Expand raw html checks to all translation files
This closes a potential security issue, where unreviewed html could
be added via translation files.
Tom Hughes [Wed, 5 Jul 2023 11:52:58 +0000 (12:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4075'
Andy Allan [Wed, 5 Jul 2023 11:04:55 +0000 (12:04 +0100)]
Remove obsolete pt-BR.yml translation file
Translatewiki now pushes pt-BR to pt.yml, which is used for both
pt and pt-BR.
Fixes #3670.
Tom Hughes [Tue, 4 Jul 2023 17:14:30 +0000 (18:14 +0100)]
Update bundle
translatewiki.net [Mon, 3 Jul 2023 11:18:06 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 1 Jul 2023 14:22:23 +0000 (15:22 +0100)]
Update bundle
Tom Hughes [Sat, 1 Jul 2023 14:15:23 +0000 (15:15 +0100)]
Update to rails 7.0.6
Tom Hughes [Sat, 1 Jul 2023 14:21:27 +0000 (15:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4074'
Tom Hughes [Sat, 1 Jul 2023 14:12:38 +0000 (15:12 +0100)]
Fix confirmation prompt when granting or revoking roles
dependabot[bot] [Fri, 30 Jun 2023 23:49:45 +0000 (23:49 +0000)]
Bump eslint from 8.43.0 to 8.44.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.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.43.0...v8.44.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, 29 Jun 2023 11:18:30 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 27 Jun 2023 17:13:33 +0000 (18:13 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 27 Jun 2023 17:09:50 +0000 (18:09 +0100)]
Update bundle
Tom Hughes [Tue, 27 Jun 2023 17:09:08 +0000 (18:09 +0100)]
Update to rails 7.0.5.1
translatewiki.net [Mon, 26 Jun 2023 11:18:51 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Jun 2023 11:23:29 +0000 (13:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Jun 2023 19:26:26 +0000 (20:26 +0100)]
Update bundle
Tom Hughes [Wed, 21 Jun 2023 19:25:08 +0000 (20:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4071'
dependabot[bot] [Tue, 20 Jun 2023 23:56:36 +0000 (23:56 +0000)]
Bump osm-community-index from 5.5.2 to 5.5.3
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.2...v5.5.3)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 19 Jun 2023 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 18 Jun 2023 17:40:48 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4068'
dependabot[bot] [Fri, 16 Jun 2023 23:56:46 +0000 (23:56 +0000)]
Bump eslint from 8.42.0 to 8.43.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.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.42.0...v8.43.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, 15 Jun 2023 11:32:36 +0000 (13:32 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 14 Jun 2023 16:41:30 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3975'
Tom Hughes [Wed, 14 Jun 2023 16:08:59 +0000 (17:08 +0100)]
Merge remote-tracking branch 'upstream/pull/4063'
Andy Allan [Wed, 14 Jun 2023 15:44:13 +0000 (16:44 +0100)]
Use Time.utc for consistency with other tests
This also allows times to be created in short form, e.g. Time.utc(2020)
Andy Allan [Wed, 14 Jun 2023 15:29:26 +0000 (16:29 +0100)]
Fix test to work in non-UK timezones
Time.new(...).utc is not the same as Time.utc(...). The
first creates a given date in local time, and then converts that to
utc, whereas the second creates the given time in UTC.
Andy Allan [Wed, 14 Jun 2023 13:08:38 +0000 (14:08 +0100)]
Merge pull request #3907 from Dimitar5555/patch-1
Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar
Andy Allan [Wed, 14 Jun 2023 09:02:05 +0000 (10:02 +0100)]
Merge pull request #4061 from stalker314314/master
rerun script/misc/update-wiki-pages
Tom Hughes [Tue, 13 Jun 2023 17:04:58 +0000 (18:04 +0100)]
Update bundle
translatewiki.net [Mon, 12 Jun 2023 11:23:57 +0000 (13:23 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Mon, 12 Jun 2023 09:02:29 +0000 (10:02 +0100)]
Merge pull request #4062 from stalker314314/fix-erb-lint-copyright
Fix ERB Lint for copyright page
Branko Kokanovic [Mon, 12 Jun 2023 08:40:45 +0000 (10:40 +0200)]
Fix ERB Lint for copyright
Branko Kokanovic [Mon, 12 Jun 2023 06:51:07 +0000 (08:51 +0200)]
update wiki pages
Tom Hughes [Sun, 11 Jun 2023 17:34:01 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/3959'
Tom Hughes [Sun, 11 Jun 2023 17:33:18 +0000 (18:33 +0100)]
Merge remote-tracking branch 'upstream/pull/4060'
Branko Kokanovic [Tue, 7 Mar 2023 22:10:12 +0000 (23:10 +0100)]
Adding information about Serbia sources
translatewiki.net [Thu, 8 Jun 2023 11:12:39 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Wed, 7 Jun 2023 23:57:20 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 2.1.2 to 2.2.0
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.1.2...v2.2.0)
---
updated-dependencies:
- dependency-name: coverallsapp/github-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 6 Jun 2023 17:45:38 +0000 (18:45 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 6 Jun 2023 17:40:21 +0000 (18:40 +0100)]
Update bundle
translatewiki.net [Mon, 5 Jun 2023 11:12:32 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 3 Jun 2023 10:15:51 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4058'
Tom Hughes [Sat, 3 Jun 2023 10:15:48 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4057'
Simon Poole [Sat, 3 Jun 2023 07:35:21 +0000 (09:35 +0200)]
Clarify that symlinks refers to git not the operating system
dependabot[bot] [Fri, 2 Jun 2023 23:56:34 +0000 (23:56 +0000)]
Bump eslint from 8.41.0 to 8.42.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.42.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.41.0...v8.42.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, 1 Jun 2023 11:17:40 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 31 May 2023 17:40:07 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4055'
Tom Hughes [Wed, 31 May 2023 17:38:33 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4054'
Tom Hughes [Wed, 31 May 2023 17:38:10 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4053'
Tom Hughes [Wed, 31 May 2023 17:37:23 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4052'
Tom Hughes [Wed, 31 May 2023 17:37:01 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4051'
Tom Hughes [Wed, 31 May 2023 17:35:38 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4050'
Andy Allan [Wed, 31 May 2023 15:22:30 +0000 (16:22 +0100)]
Simplify ruby installations
Refs #4048
* We don't currently need a specific version suffix on the package names,
since ubuntu only ships with one ruby version (and newer versions on
e.g. 23.04 are fine).
* We don't need to explicitly install libruby, since it's pulled in by
other packages as required.
* Ubuntu again ships a decent enough version of bundler for our needs,
so we don't need to install it via rubygems.
Andy Allan [Wed, 31 May 2023 16:39:54 +0000 (17:39 +0100)]
Silence image_optim warnings in development
Lots of new developers see this during configuration (e.g. rails
db:migrate) and then spend time trying to fix them. So let's avoid
the warnings entirely.
Andy Allan [Wed, 31 May 2023 16:36:53 +0000 (17:36 +0100)]
Ignore .bundle/config
This can be created by passing flags to bundler, such as the ones
used in our vagrant provisioning