]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoMerge remote-tracking branch 'upstream/pull/3222'
Tom Hughes [Wed, 16 Jun 2021 17:01:43 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/3222'

3 years agoSkip intermediate lengths when testing tag validity
Andy Allan [Wed, 16 Jun 2021 08:53:57 +0000 (09:53 +0100)]
Skip intermediate lengths when testing tag validity

It's really the upper and lower boundaries that we want to check,
and it's reasonable to assume all the intermediate values will work
fine if the boundary values are tested.

This also saves about 75% of the time taken and almost 85% of the
assertions when running all the model tests.

3 years agoUpdate bundle
Tom Hughes [Tue, 15 Jun 2021 17:39:24 +0000 (18:39 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Jun 2021 07:58:54 +0000 (09:58 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Jun 2021 14:55:57 +0000 (16:55 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3217'
Tom Hughes [Wed, 9 Jun 2021 16:46:45 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3217'

3 years agoMerge remote-tracking branch 'upstream/pull/3216'
Tom Hughes [Wed, 9 Jun 2021 16:46:11 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3216'

3 years agoSet updated_by when resolving issues
Andy Allan [Wed, 9 Jun 2021 14:47:31 +0000 (15:47 +0100)]
Set updated_by when resolving issues

Refs #3211

3 years agoMerge pull request #3208 from osm-hr/update-rcn-color
Andy Allan [Wed, 9 Jun 2021 14:29:57 +0000 (15:29 +0100)]
Merge pull request #3208 from osm-hr/update-rcn-color

fix map key color for regional OpenCycleMap

3 years agoFix case when user block durations are slightly negative
Andy Allan [Wed, 9 Jun 2021 14:14:14 +0000 (15:14 +0100)]
Fix case when user block durations are slightly negative

The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210

3 years agoEnsure that short duration blockss are shown as '0 hours'
Andy Allan [Wed, 9 Jun 2021 13:17:56 +0000 (14:17 +0100)]
Ensure that short duration blockss are shown as '0 hours'

Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210

3 years agoDrop last vestiges of ruby 2.5 support
Tom Hughes [Tue, 8 Jun 2021 19:33:25 +0000 (20:33 +0100)]
Drop last vestiges of ruby 2.5 support

3 years agoUpdate bundle
Tom Hughes [Tue, 8 Jun 2021 18:44:48 +0000 (19:44 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3214'
Tom Hughes [Tue, 8 Jun 2021 18:41:39 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3214'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Jun 2021 12:58:59 +0000 (14:58 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.27.0 to 7.28.0
dependabot[bot] [Mon, 7 Jun 2021 05:01:26 +0000 (05:01 +0000)]
Bump eslint from 7.27.0 to 7.28.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.27.0...v7.28.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoFix erblint warnings
Tom Hughes [Sat, 5 Jun 2021 06:40:55 +0000 (07:40 +0100)]
Fix erblint warnings

3 years agoSet a referrer policy
Tom Hughes [Fri, 4 Jun 2021 20:49:53 +0000 (21:49 +0100)]
Set a referrer policy

3 years agoMerge remote-tracking branch 'upstream/pull/3213'
Tom Hughes [Fri, 4 Jun 2021 20:10:32 +0000 (21:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3213'

3 years agoMerge remote-tracking branch 'upstream/pull/3212'
Tom Hughes [Fri, 4 Jun 2021 20:09:26 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3212'

3 years agoAdded missing dependency for fedora install
Robbendebiene [Fri, 4 Jun 2021 14:48:33 +0000 (16:48 +0200)]
Added missing dependency for fedora install

3 years agofixed nodejs package name for fedora
Robbendebiene [Fri, 4 Jun 2021 14:29:08 +0000 (16:29 +0200)]
fixed nodejs package name for fedora

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Jun 2021 13:24:16 +0000 (15:24 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 1 Jun 2021 17:27:50 +0000 (18:27 +0100)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 1 Jun 2021 17:25:21 +0000 (18:25 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 31 May 2021 08:10:52 +0000 (10:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3209'
Tom Hughes [Fri, 28 May 2021 06:27:11 +0000 (07:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3209'

3 years agoBump actions/cache from 2.1.5 to 2.1.6
dependabot[bot] [Fri, 28 May 2021 05:47:37 +0000 (05:47 +0000)]
Bump actions/cache from 2.1.5 to 2.1.6

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 May 2021 13:49:57 +0000 (15:49 +0200)]
Localisation updates from https://translatewiki.net.

3 years agofix map key color for regional OpenCycleMap, as it changed from light cyan to purple...
Matija Nalis [Tue, 25 May 2021 20:48:38 +0000 (22:48 +0200)]
fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map.
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785
3 years agoUpdate bundle
Tom Hughes [Tue, 25 May 2021 17:27:19 +0000 (18:27 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3206'
Tom Hughes [Tue, 25 May 2021 14:30:55 +0000 (15:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3206'

3 years agoBump ohauth from 1.0.0 to 1.0.1
dependabot[bot] [Tue, 25 May 2021 05:01:10 +0000 (05:01 +0000)]
Bump ohauth from 1.0.0 to 1.0.1

Bumps [ohauth](https://github.com/osmlab/ohauth) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge remote-tracking branch 'upstream/pull/3202'
Tom Hughes [Mon, 24 May 2021 17:17:40 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3202'

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 May 2021 12:14:01 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.26.0 to 7.27.0
dependabot[bot] [Mon, 24 May 2021 05:01:37 +0000 (05:01 +0000)]
Bump eslint from 7.26.0 to 7.27.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.26.0...v7.27.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge remote-tracking branch 'upstream/pull/3200'
Tom Hughes [Thu, 20 May 2021 17:17:39 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3200'

3 years agoFix downloading of image variants
Tom Hughes [Wed, 19 May 2021 17:44:41 +0000 (18:44 +0100)]
Fix downloading of image variants

3 years agoSwitch to using 'rails test:all' in documentation and CI
Andy Allan [Wed, 19 May 2021 10:02:41 +0000 (11:02 +0100)]
Switch to using 'rails test:all' in documentation and CI

Fixes #3116.

This allows us to drop our custom patch for running system tests,
as well as opening up all the usual rails test goodies like running
individual files or directories.

3 years agoUpdate bundle
Tom Hughes [Tue, 18 May 2021 07:29:51 +0000 (08:29 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3199'
Tom Hughes [Tue, 18 May 2021 07:26:17 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3199'

3 years agoBump puma from 5.3.0 to 5.3.1
dependabot[bot] [Tue, 18 May 2021 01:34:02 +0000 (01:34 +0000)]
Bump puma from 5.3.0 to 5.3.1

Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1.
- [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.3.0...v5.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoEnable variant tracking for Active Storage
Tom Hughes [Mon, 17 May 2021 18:29:12 +0000 (19:29 +0100)]
Enable variant tracking for Active Storage

3 years agoFix eslint warnings
Tom Hughes [Mon, 17 May 2021 18:28:20 +0000 (19:28 +0100)]
Fix eslint warnings

3 years agoEnable some more rails 6.1 defaults
Tom Hughes [Mon, 17 May 2021 18:15:55 +0000 (19:15 +0100)]
Enable some more rails 6.1 defaults

3 years agoMark javascript issued cookies with SameSite=Lax
Tom Hughes [Mon, 17 May 2021 18:06:43 +0000 (19:06 +0100)]
Mark javascript issued cookies with SameSite=Lax

3 years agoSwitch to using js-cookie to manage cookies from javascript
Tom Hughes [Mon, 17 May 2021 17:57:48 +0000 (18:57 +0100)]
Switch to using js-cookie to manage cookies from javascript

3 years agoDefault rails generated cookies to SameSite=Lax
Tom Hughes [Mon, 17 May 2021 17:39:22 +0000 (18:39 +0100)]
Default rails generated cookies to SameSite=Lax

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 May 2021 11:18:44 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoSwitch to new defaults for queue names
Tom Hughes [Thu, 13 May 2021 19:41:41 +0000 (20:41 +0100)]
Switch to new defaults for queue names

3 years agoEnable new Active Job defaults
Tom Hughes [Thu, 13 May 2021 19:25:42 +0000 (20:25 +0100)]
Enable new Active Job defaults

3 years agoEnable link header for asset preloading
Tom Hughes [Thu, 13 May 2021 18:57:47 +0000 (19:57 +0100)]
Enable link header for asset preloading

3 years agoEnable new connection handling API
Tom Hughes [Thu, 13 May 2021 18:54:07 +0000 (19:54 +0100)]
Enable new connection handling API

3 years agoEnable use of URL safe CSRF tokens
Tom Hughes [Thu, 13 May 2021 18:52:02 +0000 (19:52 +0100)]
Enable use of URL safe CSRF tokens

3 years agoFix rubocop Rake/MethodDefinitionInTask warnings
Tom Hughes [Thu, 13 May 2021 18:28:26 +0000 (19:28 +0100)]
Fix rubocop Rake/MethodDefinitionInTask warnings

3 years agoAdd ruby 3.0 to test matrix
Tom Hughes [Thu, 13 May 2021 17:21:50 +0000 (18:21 +0100)]
Add ruby 3.0 to test matrix

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 May 2021 11:54:27 +0000 (13:54 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3193'
Tom Hughes [Thu, 13 May 2021 11:29:55 +0000 (12:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3193'

3 years agoUse image_processing macros to resize images
Tom Hughes [Tue, 11 May 2021 19:28:20 +0000 (20:28 +0100)]
Use image_processing macros to resize images

3 years agoFix deprecation warnings
Tom Hughes [Tue, 29 Dec 2020 22:36:26 +0000 (22:36 +0000)]
Fix deprecation warnings

3 years agoUpdate to rails 6.1.3.2
Tom Hughes [Thu, 10 Dec 2020 14:44:37 +0000 (14:44 +0000)]
Update to rails 6.1.3.2

3 years agoMerge remote-tracking branch 'upstream/pull/3195'
Tom Hughes [Wed, 12 May 2021 10:53:34 +0000 (11:53 +0100)]
Merge remote-tracking branch 'upstream/pull/3195'

3 years agoAdd rubocop-rake
Andy Allan [Wed, 12 May 2021 10:16:44 +0000 (11:16 +0100)]
Add rubocop-rake

This checks the coding standards in our rake files.

3 years agoMerge remote-tracking branch 'upstream/pull/3194'
Tom Hughes [Wed, 12 May 2021 07:22:26 +0000 (08:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3194'

3 years agoBump actions/setup-ruby from 1 to 1.1.3
dependabot[bot] [Wed, 12 May 2021 05:33:28 +0000 (05:33 +0000)]
Bump actions/setup-ruby from 1 to 1.1.3

Bumps [actions/setup-ruby](https://github.com/actions/setup-ruby) from 1 to 1.1.3.
- [Release notes](https://github.com/actions/setup-ruby/releases)
- [Commits](https://github.com/actions/setup-ruby/compare/v1...v1.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoFix calculation of friendship rate limit
Tom Hughes [Tue, 11 May 2021 14:49:48 +0000 (15:49 +0100)]
Fix calculation of friendship rate limit

3 years agoAdd rate limiting to user friendships
Tom Hughes [Tue, 11 May 2021 11:02:05 +0000 (12:02 +0100)]
Add rate limiting to user friendships

3 years agoDrop monkey patch that is no longer needed with rails 6
Tom Hughes [Mon, 10 May 2021 19:17:15 +0000 (20:17 +0100)]
Drop monkey patch that is no longer needed with rails 6

3 years agoDrop monkey patch that is no longer required
Tom Hughes [Mon, 10 May 2021 08:50:41 +0000 (09:50 +0100)]
Drop monkey patch that is no longer required

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 May 2021 12:13:33 +0000 (14:13 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Mon, 10 May 2021 07:16:56 +0000 (08:16 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3192'
Tom Hughes [Mon, 10 May 2021 07:10:48 +0000 (08:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3192'

3 years agoBump eslint from 7.25.0 to 7.26.0
dependabot[bot] [Mon, 10 May 2021 05:02:36 +0000 (05:02 +0000)]
Bump eslint from 7.25.0 to 7.26.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.25.0 to 7.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.25.0...v7.26.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 7 May 2021 09:02:24 +0000 (11:02 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate to rails 6.0.3.7
Tom Hughes [Wed, 5 May 2021 18:06:37 +0000 (19:06 +0100)]
Update to rails 6.0.3.7

3 years agoUpdate bundle
Tom Hughes [Tue, 4 May 2021 19:33:32 +0000 (20:33 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 May 2021 13:30:00 +0000 (15:30 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 30 Apr 2021 07:05:27 +0000 (09:05 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3029'
Tom Hughes [Thu, 29 Apr 2021 18:42:51 +0000 (19:42 +0100)]
Merge remote-tracking branch 'upstream/pull/3029'

3 years agoMerge remote-tracking branch 'upstream/pull/3187'
Tom Hughes [Wed, 28 Apr 2021 17:59:34 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3187'

3 years agoMerge remote-tracking branch 'upstream/pull/3186'
Tom Hughes [Wed, 28 Apr 2021 17:58:59 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/3186'

3 years agoRefactor user blocks information to use a dl
Andy Allan [Wed, 28 Apr 2021 16:28:30 +0000 (17:28 +0100)]
Refactor user blocks information to use a dl

This also standardises the labels to have the colon, in common with
oauth_clients#show.

3 years agoMerge branch 'pull/3146'
Andy Allan [Wed, 28 Apr 2021 15:03:57 +0000 (16:03 +0100)]
Merge branch 'pull/3146'

3 years agoMove duration to its own line, so that it can be clearly labelled
Andy Allan [Wed, 28 Apr 2021 15:01:03 +0000 (16:01 +0100)]
Move duration to its own line, so that it can be clearly labelled

3 years agoUse the rake extension for remaining files, for consistency
Andy Allan [Wed, 28 Apr 2021 11:05:25 +0000 (12:05 +0100)]
Use the rake extension for remaining files, for consistency

3 years agoMerge pull request #3104 from fredrik-lindseth/patch-1
Andy Allan [Wed, 28 Apr 2021 10:58:10 +0000 (11:58 +0100)]
Merge pull request #3104 from fredrik-lindseth/patch-1

Format openstreetmap.org/stats/data_stats

3 years agoMerge pull request #3169 from harry-wood/empty-lists
Andy Allan [Wed, 28 Apr 2021 09:36:09 +0000 (10:36 +0100)]
Merge pull request #3169 from harry-wood/empty-lists

Display message when the there are no notes/comments to display

3 years agoUpdate bundle
Tom Hughes [Tue, 27 Apr 2021 17:52:58 +0000 (18:52 +0100)]
Update bundle

3 years agoMonkey patch oauth gem to avoid use of deprecated URI.unescape
Tom Hughes [Mon, 26 Apr 2021 21:07:37 +0000 (22:07 +0100)]
Monkey patch oauth gem to avoid use of deprecated URI.unescape

3 years agoHandle UTF-8 correctly in monkey patched OAuth::Helper.escape
Tom Hughes [Mon, 26 Apr 2021 21:06:19 +0000 (22:06 +0100)]
Handle UTF-8 correctly in monkey patched OAuth::Helper.escape

Fixes #3185

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Apr 2021 13:30:10 +0000 (15:30 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3183'
Tom Hughes [Mon, 26 Apr 2021 13:11:43 +0000 (14:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3183'

3 years agoBump eslint from 7.24.0 to 7.25.0
dependabot[bot] [Mon, 26 Apr 2021 05:01:19 +0000 (05:01 +0000)]
Bump eslint from 7.24.0 to 7.25.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.24.0 to 7.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.24.0...v7.25.0)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoFix some ruby 3 compatibility issues
Tom Hughes [Thu, 22 Apr 2021 18:20:25 +0000 (19:20 +0100)]
Fix some ruby 3 compatibility issues

3 years agoUpdate deadlock_retry gem for ruby 3 compatibility
Tom Hughes [Thu, 22 Apr 2021 18:08:37 +0000 (19:08 +0100)]
Update deadlock_retry gem for ruby 3 compatibility

3 years agoMonkey patch oauth gem to avoid use of deprecated URI.escape
Tom Hughes [Thu, 22 Apr 2021 17:53:27 +0000 (18:53 +0100)]
Monkey patch oauth gem to avoid use of deprecated URI.escape

3 years agoDrop dynamic_form gem which is no longer required
Tom Hughes [Thu, 22 Apr 2021 17:25:34 +0000 (18:25 +0100)]
Drop dynamic_form gem which is no longer required

3 years agoDrop version constraint for debug_inspector
Tom Hughes [Thu, 22 Apr 2021 13:21:55 +0000 (13:21 +0000)]
Drop version constraint for debug_inspector

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Apr 2021 13:09:51 +0000 (15:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 20 Apr 2021 17:26:37 +0000 (18:26 +0100)]
Fix new rubocop warnings