]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoMerge pull request #2902 from seav/patch-1
Andy Allan [Wed, 21 Oct 2020 15:36:26 +0000 (17:36 +0200)]
Merge pull request #2902 from seav/patch-1

Link to official OWG Banner Policy page

4 years agoLink to official OWG Banner Policy page
Eugene Alvin Villar [Wed, 21 Oct 2020 15:25:51 +0000 (23:25 +0800)]
Link to official OWG Banner Policy page

- Link to the official Banner Policy page on the OWG website instead of a GitHub ticket discussion
- Reformat Markdown lists so that the rendered HTML results in properly nested lists

4 years agoMerge remote-tracking branch 'upstream/pull/2899'
Tom Hughes [Wed, 21 Oct 2020 14:12:05 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2899'

4 years agoMerge remote-tracking branch 'upstream/pull/2898'
Tom Hughes [Wed, 21 Oct 2020 14:11:15 +0000 (15:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2898'

4 years agoAvoid various uses of html_safe
Andy Allan [Wed, 21 Oct 2020 12:12:14 +0000 (14:12 +0200)]
Avoid various uses of html_safe

We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.

4 years agoRemove unused translation
Andy Allan [Wed, 21 Oct 2020 13:38:53 +0000 (15:38 +0200)]
Remove unused translation

The code that used this was removed in 9a9e13af901e9d66357135fb39b111fc9e26b3b2

4 years agoRemove unused translations
Andy Allan [Wed, 21 Oct 2020 13:37:57 +0000 (15:37 +0200)]
Remove unused translations

The code that used these translations was removed in aaeca5b5346b01d7ef26a301492804d36049eff8

4 years agoMerge remote-tracking branch 'upstream/pull/2896'
Tom Hughes [Tue, 20 Oct 2020 12:21:24 +0000 (13:21 +0100)]
Merge remote-tracking branch 'upstream/pull/2896'

4 years agoFix call to UserMailer in message delivery
Andy Allan [Tue, 20 Oct 2020 11:58:08 +0000 (13:58 +0200)]
Fix call to UserMailer in message delivery

Fixes #2895

4 years agoMerge remote-tracking branch 'upstream/pull/2894'
Tom Hughes [Tue, 20 Oct 2020 07:17:16 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2894'

4 years agoMerge remote-tracking branch 'upstream/pull/2893'
Tom Hughes [Tue, 20 Oct 2020 07:17:12 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2893'

4 years agoBump aws-sdk-s3 from 1.83.0 to 1.83.1
dependabot[bot] [Tue, 20 Oct 2020 05:03:51 +0000 (05:03 +0000)]
Bump aws-sdk-s3 from 1.83.0 to 1.83.1

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump omniauth-facebook from 7.0.0 to 8.0.0
dependabot[bot] [Tue, 20 Oct 2020 05:02:46 +0000 (05:02 +0000)]
Bump omniauth-facebook from 7.0.0 to 8.0.0

Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate test results for presence of zh-HK translations
Tom Hughes [Mon, 19 Oct 2020 18:26:17 +0000 (19:26 +0100)]
Update test results for presence of zh-HK translations

4 years agoMerge remote-tracking branch 'upstream/pull/2892'
Tom Hughes [Mon, 19 Oct 2020 18:23:48 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2892'

4 years agoMerge remote-tracking branch 'upstream/pull/2891'
Tom Hughes [Mon, 19 Oct 2020 18:23:46 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2891'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Oct 2020 13:01:22 +0000 (15:01 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump webmock from 3.9.2 to 3.9.3
dependabot[bot] [Mon, 19 Oct 2020 05:02:17 +0000 (05:02 +0000)]
Bump webmock from 3.9.2 to 3.9.3

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.2...v3.9.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump faraday from 1.0.1 to 1.1.0
dependabot[bot] [Mon, 19 Oct 2020 05:01:26 +0000 (05:01 +0000)]
Bump faraday from 1.0.1 to 1.1.0

Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.0.1...v1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2888'
Tom Hughes [Fri, 16 Oct 2020 07:26:56 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/2888'

4 years agoBump activerecord-import from 1.0.6 to 1.0.7
dependabot[bot] [Fri, 16 Oct 2020 05:02:14 +0000 (05:02 +0000)]
Bump activerecord-import from 1.0.6 to 1.0.7

Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.6...v1.0.7)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2887'
Tom Hughes [Thu, 15 Oct 2020 07:12:25 +0000 (08:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2887'

4 years agoMerge remote-tracking branch 'upstream/pull/2884'
Tom Hughes [Thu, 15 Oct 2020 07:12:21 +0000 (08:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2884'

4 years agoBump i18n-js from 3.7.1 to 3.8.0
dependabot[bot] [Thu, 15 Oct 2020 05:01:21 +0000 (05:01 +0000)]
Bump i18n-js from 3.7.1 to 3.8.0

Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoRename Notifier to UserMailer
Andy Allan [Wed, 14 Oct 2020 13:04:58 +0000 (15:04 +0200)]
Rename Notifier to UserMailer

It's a convention in rails to name your mailers with a Mailer suffix, and is also common to name the class after the recipient (e.g. User, Admin). So UserMailer seems a reasonable choice.

4 years agoMerge remote-tracking branch 'upstream/pull/2881'
Tom Hughes [Tue, 13 Oct 2020 07:14:20 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2881'

4 years agoMerge remote-tracking branch 'upstream/pull/2880'
Tom Hughes [Tue, 13 Oct 2020 07:14:18 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2880'

4 years agoBump rubocop from 0.93.0 to 0.93.1
dependabot[bot] [Tue, 13 Oct 2020 05:01:31 +0000 (05:01 +0000)]
Bump rubocop from 0.93.0 to 0.93.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.0...v0.93.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump webmock from 3.9.1 to 3.9.2
dependabot[bot] [Tue, 13 Oct 2020 05:01:16 +0000 (05:01 +0000)]
Bump webmock from 3.9.1 to 3.9.2

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.1...v3.9.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2879'
Tom Hughes [Mon, 12 Oct 2020 18:08:10 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2879'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Oct 2020 13:58:23 +0000 (15:58 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump eslint from 7.10.0 to 7.11.0
dependabot[bot] [Mon, 12 Oct 2020 05:01:55 +0000 (05:01 +0000)]
Bump eslint from 7.10.0 to 7.11.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.10.0 to 7.11.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.10.0...v7.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoFix new rubocop warnings
Tom Hughes [Fri, 9 Oct 2020 07:26:38 +0000 (08:26 +0100)]
Fix new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2878'
Tom Hughes [Fri, 9 Oct 2020 07:21:07 +0000 (08:21 +0100)]
Merge remote-tracking branch 'upstream/pull/2878'

4 years agoBump rubocop from 0.92.0 to 0.93.0
dependabot[bot] [Fri, 9 Oct 2020 05:01:33 +0000 (05:01 +0000)]
Bump rubocop from 0.92.0 to 0.93.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.92.0...v0.93.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Oct 2020 14:01:10 +0000 (16:01 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoRevert accidental changes to database structure
Tom Hughes [Thu, 8 Oct 2020 08:51:04 +0000 (09:51 +0100)]
Revert accidental changes to database structure

4 years agoMerge remote-tracking branch 'upstream/pull/2877'
Tom Hughes [Thu, 8 Oct 2020 07:13:22 +0000 (08:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2877'

4 years agoBump rails from 6.0.3.3 to 6.0.3.4
dependabot[bot] [Thu, 8 Oct 2020 05:01:26 +0000 (05:01 +0000)]
Bump rails from 6.0.3.3 to 6.0.3.4

Bumps [rails](https://github.com/rails/rails) from 6.0.3.3 to 6.0.3.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.0.3.3...v6.0.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoIndex changeset comments by changeset and date
Tom Hughes [Tue, 6 Oct 2020 22:10:52 +0000 (23:10 +0100)]
Index changeset comments by changeset and date

4 years agoIndex changeset comments by author and date
Tom Hughes [Tue, 6 Oct 2020 21:42:44 +0000 (22:42 +0100)]
Index changeset comments by author and date

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Oct 2020 14:05:15 +0000 (16:05 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Sun, 4 Oct 2020 10:48:42 +0000 (11:48 +0100)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/2875'
Tom Hughes [Fri, 2 Oct 2020 11:38:12 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/2875'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 2 Oct 2020 07:14:03 +0000 (09:14 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump better_errors from 2.8.1 to 2.8.2
dependabot[bot] [Fri, 2 Oct 2020 05:01:02 +0000 (05:01 +0000)]
Bump better_errors from 2.8.1 to 2.8.2

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2868'
Tom Hughes [Thu, 1 Oct 2020 07:57:41 +0000 (08:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2868'

4 years agoMerge remote-tracking branch 'upstream/pull/2867'
Tom Hughes [Thu, 1 Oct 2020 07:57:39 +0000 (08:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2867'

4 years agoMerge remote-tracking branch 'upstream/pull/2864'
Tom Hughes [Thu, 1 Oct 2020 07:57:36 +0000 (08:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2864'

4 years agoBump rotp from 6.1.0 to 6.2.0
dependabot[bot] [Thu, 1 Oct 2020 05:01:31 +0000 (05:01 +0000)]
Bump rotp from 6.1.0 to 6.2.0

Bumps [rotp](https://github.com/mdp/rotp) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/mdp/rotp/releases)
- [Changelog](https://github.com/mdp/rotp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mdp/rotp/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.81.1 to 1.82.0
dependabot[bot] [Thu, 1 Oct 2020 05:01:08 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.81.1 to 1.82.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.81.1 to 1.82.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUse the db:seed task to load languages
Andy Allan [Wed, 30 Sep 2020 13:09:49 +0000 (15:09 +0200)]
Use the db:seed task to load languages

This is seed data that should reasonably be loaded into every database,
even those that are otherwise empty (e.g. no geo data). Using the seeds
process means that it will usually be loaded by default, and is easier
to find for existing rails developers.

4 years agoMerge remote-tracking branch 'upstream/pull/2863'
Tom Hughes [Wed, 30 Sep 2020 11:40:21 +0000 (12:40 +0100)]
Merge remote-tracking branch 'upstream/pull/2863'

4 years agoRemove unused locale scripts
Andy Allan [Wed, 30 Sep 2020 11:17:43 +0000 (13:17 +0200)]
Remove unused locale scripts

We no longer need these scripts, given our current translatewiki workflows

4 years agoMerge remote-tracking branch 'upstream/pull/2838'
Tom Hughes [Wed, 30 Sep 2020 10:57:18 +0000 (11:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2838'

4 years agoMerge remote-tracking branch 'upstream/pull/2839'
Tom Hughes [Wed, 30 Sep 2020 10:54:30 +0000 (11:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2839'

4 years agoMerge remote-tracking branch 'upstream/pull/2862'
Tom Hughes [Wed, 30 Sep 2020 07:28:02 +0000 (08:28 +0100)]
Merge remote-tracking branch 'upstream/pull/2862'

4 years agoBump autoprefixer-rails from 10.0.0.2 to 10.0.1.0
dependabot[bot] [Wed, 30 Sep 2020 05:01:11 +0000 (05:01 +0000)]
Bump autoprefixer-rails from 10.0.0.2 to 10.0.1.0

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.0.2 to 10.0.1.0.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.0.2...10.0.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoInvalidate existing sessions when changing email or password
Tom Hughes [Tue, 29 Sep 2020 13:22:51 +0000 (14:22 +0100)]
Invalidate existing sessions when changing email or password

As we don't have any way to actually find the active sessions for
an account we instead store a fingerprint in the session, and refuse
to use any session with a different fingerprint.

4 years agoDelete any outstanding tokens when a user changes their email
Tom Hughes [Tue, 29 Sep 2020 12:47:40 +0000 (13:47 +0100)]
Delete any outstanding tokens when a user changes their email

This ensures that any tokens previously sent to the old email address
can no longer be used if somebody were able to access that address.

4 years agoMerge remote-tracking branch 'upstream/pull/2859'
Tom Hughes [Tue, 29 Sep 2020 07:19:47 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2859'

4 years agoMerge remote-tracking branch 'upstream/pull/2858'
Tom Hughes [Tue, 29 Sep 2020 07:19:43 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2858'

4 years agoBump puma from 4.3.6 to 5.0.2
dependabot[bot] [Tue, 29 Sep 2020 05:01:19 +0000 (05:01 +0000)]
Bump puma from 4.3.6 to 5.0.2

Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.2.
- [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/v4.3.6...v5.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump brakeman from 4.9.1 to 4.10.0
dependabot[bot] [Tue, 29 Sep 2020 05:01:06 +0000 (05:01 +0000)]
Bump brakeman from 4.9.1 to 4.10.0

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.9.1...v4.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 28 Sep 2020 15:23:19 +0000 (17:23 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2857'
Tom Hughes [Mon, 28 Sep 2020 07:46:47 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2857'

4 years agoMerge remote-tracking branch 'upstream/pull/2856'
Tom Hughes [Mon, 28 Sep 2020 07:46:43 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2856'

4 years agoMerge remote-tracking branch 'upstream/pull/2855'
Tom Hughes [Mon, 28 Sep 2020 07:46:41 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2855'

4 years agoMerge remote-tracking branch 'upstream/pull/2854'
Tom Hughes [Mon, 28 Sep 2020 07:46:38 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/2854'

4 years agoBump eslint from 7.9.0 to 7.10.0
dependabot[bot] [Mon, 28 Sep 2020 05:02:38 +0000 (05:02 +0000)]
Bump eslint from 7.9.0 to 7.10.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.9.0 to 7.10.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.9.0...v7.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump rubocop from 0.91.1 to 0.92.0
dependabot[bot] [Mon, 28 Sep 2020 05:01:51 +0000 (05:01 +0000)]
Bump rubocop from 0.91.1 to 0.92.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.1 to 0.92.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.91.1...v0.92.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.81.0 to 1.81.1
dependabot[bot] [Mon, 28 Sep 2020 05:01:25 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.81.0 to 1.81.1

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.81.0 to 1.81.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump dalli from 2.7.10 to 2.7.11
dependabot[bot] [Mon, 28 Sep 2020 05:01:12 +0000 (05:01 +0000)]
Bump dalli from 2.7.10 to 2.7.11

Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.10 to 2.7.11.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.10...v2.7.11)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 24 Sep 2020 14:02:43 +0000 (16:02 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2848'
Tom Hughes [Thu, 24 Sep 2020 10:40:33 +0000 (11:40 +0100)]
Merge remote-tracking branch 'upstream/pull/2848'

4 years agoMerge remote-tracking branch 'upstream/pull/2847'
Tom Hughes [Thu, 24 Sep 2020 10:40:30 +0000 (11:40 +0100)]
Merge remote-tracking branch 'upstream/pull/2847'

4 years agoBump browser from 4.2.0 to 5.0.0
dependabot[bot] [Thu, 24 Sep 2020 05:01:17 +0000 (05:01 +0000)]
Bump browser from 4.2.0 to 5.0.0

Bumps [browser](https://github.com/fnando/browser) from 4.2.0 to 5.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v4.2.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump rubocop from 0.91.0 to 0.91.1
dependabot[bot] [Thu, 24 Sep 2020 05:00:59 +0000 (05:00 +0000)]
Bump rubocop from 0.91.0 to 0.91.1

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.0 to 0.91.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.91.0...v0.91.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2846'
Tom Hughes [Mon, 21 Sep 2020 15:35:08 +0000 (16:35 +0100)]
Merge remote-tracking branch 'upstream/pull/2846'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump rubocop-performance from 1.8.0 to 1.8.1
dependabot[bot] [Mon, 21 Sep 2020 05:01:00 +0000 (05:01 +0000)]
Bump rubocop-performance from 1.8.0 to 1.8.1

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.8.0...v1.8.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoAPI User details: format tweaks
mmd-osm [Fri, 18 Sep 2020 19:04:38 +0000 (21:04 +0200)]
API User details: format tweaks

- _show_ to return single user only
- remove nesting for languages

4 years agoMerge remote-tracking branch 'upstream/pull/2844'
Tom Hughes [Fri, 18 Sep 2020 07:31:33 +0000 (08:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2844'

4 years agoMerge remote-tracking branch 'upstream/pull/2842'
Tom Hughes [Fri, 18 Sep 2020 07:31:31 +0000 (08:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2842'

4 years agoBump better_errors from 2.8.0 to 2.8.1
dependabot[bot] [Fri, 18 Sep 2020 05:01:37 +0000 (05:01 +0000)]
Bump better_errors from 2.8.0 to 2.8.1

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.0...v2.8.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump autoprefixer-rails from 10.0.0 to 10.0.0.2
dependabot[bot] [Fri, 18 Sep 2020 05:01:08 +0000 (05:01 +0000)]
Bump autoprefixer-rails from 10.0.0 to 10.0.0.2

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.0 to 10.0.0.2.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.0...10.0.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Sep 2020 14:47:48 +0000 (16:47 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoJson user details: unit tests
mmd-osm [Wed, 16 Sep 2020 20:13:19 +0000 (22:13 +0200)]
Json user details: unit tests

4 years agoFix unit test, assume application/xml instead of text/xml
mmd-osm [Wed, 16 Sep 2020 18:29:37 +0000 (20:29 +0200)]
Fix unit test, assume application/xml instead of text/xml

4 years agoStyle changeset descriptions with italics on browse pages
Andy Allan [Wed, 16 Sep 2020 15:50:07 +0000 (17:50 +0200)]
Style changeset descriptions with italics on browse pages

Alternative to #580

This reworks changeset descriptions to use italics instead of header
elements, in order to make them more like quotes.

Care has been taken to make sure that there is still a header element
as the first element of the common details partial, in order to make
the history pages look right (where the partial appears multiple times).

4 years agoFix erblint warnings
Tom Hughes [Wed, 16 Sep 2020 15:59:10 +0000 (16:59 +0100)]
Fix erblint warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2837'
Tom Hughes [Wed, 16 Sep 2020 15:35:55 +0000 (16:35 +0100)]
Merge remote-tracking branch 'upstream/pull/2837'

4 years agoShow linked features as collapsable detail panels on feature browse pages
Andy Allan [Wed, 16 Sep 2020 13:25:27 +0000 (15:25 +0200)]
Show linked features as collapsable detail panels on feature browse pages

Fixes #2823

The panels are collapsed by default, when there is a long list of features, but
open on short lists to save on clicks. 10 items is arbitrary but seemed reasonable.

4 years agoMerge pull request #2809 from tomhughes/bootstrap
Andy Allan [Wed, 16 Sep 2020 08:43:21 +0000 (10:43 +0200)]
Merge pull request #2809 from tomhughes/bootstrap

Convert some more forms to use bootstrap

4 years agoFix new rubocop warnings
Tom Hughes [Wed, 16 Sep 2020 07:28:25 +0000 (08:28 +0100)]
Fix new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2834'
Tom Hughes [Wed, 16 Sep 2020 07:24:55 +0000 (08:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2834'

4 years agoMerge remote-tracking branch 'upstream/pull/2833'
Tom Hughes [Wed, 16 Sep 2020 07:24:52 +0000 (08:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2833'

4 years agoMerge remote-tracking branch 'upstream/pull/2832'
Tom Hughes [Wed, 16 Sep 2020 07:24:49 +0000 (08:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2832'

4 years agoMerge remote-tracking branch 'upstream/pull/2831'
Tom Hughes [Wed, 16 Sep 2020 07:24:47 +0000 (08:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2831'

4 years agoMerge remote-tracking branch 'upstream/pull/2830'
Tom Hughes [Wed, 16 Sep 2020 07:24:45 +0000 (08:24 +0100)]
Merge remote-tracking branch 'upstream/pull/2830'