]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 29 Dec 2020 08:03:29 +0000 (09:03 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMerge pull request #3018 from tordans/line-break-for-long-urls
Andy Allan [Mon, 28 Dec 2020 11:15:58 +0000 (11:15 +0000)]
Merge pull request #3018 from tordans/line-break-for-long-urls

Break long URLs in blog post show

3 years agoBreak long URLs where richtext is used.
Tobias Jordans [Sun, 27 Dec 2020 13:19:36 +0000 (14:19 +0100)]
Break long URLs where richtext is used.

For example on the blog post show page.

This uses https://getbootstrap.com/docs/4.4/utilities/text/#word-break to break long URLs on the blog post show view.

4 years agoMerge remote-tracking branch 'upstream/pull/3017'
Tom Hughes [Thu, 24 Dec 2020 14:07:41 +0000 (14:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3017'

4 years agoRefactor diary entry forms to use a custom form builder
Andy Allan [Thu, 24 Dec 2020 13:31:04 +0000 (13:31 +0000)]
Refactor diary entry forms to use a custom form builder

4 years agoEnsure richtext editing style rules are only applied on standard forms
Andy Allan [Thu, 24 Dec 2020 13:29:12 +0000 (13:29 +0000)]
Ensure richtext editing style rules are only applied on standard forms

4 years agoMerge remote-tracking branch 'upstream/pull/3016'
Tom Hughes [Wed, 23 Dec 2020 15:24:10 +0000 (15:24 +0000)]
Merge remote-tracking branch 'upstream/pull/3016'

4 years agoMerge remote-tracking branch 'upstream/pull/3015'
Tom Hughes [Wed, 23 Dec 2020 15:02:04 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3015'

4 years agoReturn the centre of the image if the bbox has no extent
Andy Allan [Wed, 23 Dec 2020 15:01:01 +0000 (15:01 +0000)]
Return the centre of the image if the bbox has no extent

Fixes #3007. If all the provided points in the gpx file have the same
lat/lon, then an image where they are all at the centre seems plausible.

4 years agoRemove SystemTimer and use stdlib Timeout directly
Andy Allan [Wed, 23 Dec 2020 14:25:58 +0000 (14:25 +0000)]
Remove SystemTimer and use stdlib Timeout directly

SystemTimer was only needed on ruby 1.8, and we dropped support for
that a long time ago.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 22 Dec 2020 13:04:52 +0000 (14:04 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Mon, 21 Dec 2020 09:47:00 +0000 (09:47 +0000)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/3014'
Tom Hughes [Mon, 21 Dec 2020 09:45:22 +0000 (09:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3014'

4 years agoBump eslint from 7.15.0 to 7.16.0
dependabot[bot] [Mon, 21 Dec 2020 05:03:00 +0000 (05:03 +0000)]
Bump eslint from 7.15.0 to 7.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.15.0 to 7.16.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.15.0...v7.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMake coverage testing work with parallel tests
Tom Hughes [Fri, 18 Dec 2020 22:39:23 +0000 (22:39 +0000)]
Make coverage testing work with parallel tests

https://github.com/simplecov-ruby/simplecov/issues/718#issuecomment-538201587

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Dec 2020 14:21:34 +0000 (15:21 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/3010'
Tom Hughes [Thu, 17 Dec 2020 12:30:05 +0000 (12:30 +0000)]
Merge remote-tracking branch 'upstream/pull/3010'

4 years agoMerge pull request #3009 from gravitystorm/svg_icons
Andy Allan [Thu, 17 Dec 2020 11:44:22 +0000 (11:44 +0000)]
Merge pull request #3009 from gravitystorm/svg_icons

Add updated authentication icons

4 years agoMerge remote-tracking branch 'upstream/pull/3002'
Tom Hughes [Wed, 16 Dec 2020 19:17:22 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3002'

4 years agoIncrease memory given to the virtualbox vm
Andy Allan [Wed, 16 Dec 2020 18:23:38 +0000 (18:23 +0000)]
Increase memory given to the virtualbox vm

Fixes #2972

Like others, I found that the previous setting caused OOM failures, and
4096 was sufficient. I suspect lower values will also work, but I don't
have time or inclination to bisect a smaller value.

4 years agoUse bootstrap utility class instead of custom css
Andy Allan [Wed, 16 Dec 2020 11:57:34 +0000 (11:57 +0000)]
Use bootstrap utility class instead of custom css

4 years agoIgnore GPX archive entries that aren't regular files
Tom Hughes [Wed, 16 Dec 2020 11:17:51 +0000 (11:17 +0000)]
Ignore GPX archive entries that aren't regular files

Fixes #3008

4 years agoConvert id column for oauth_nonces to bigint
Tom Hughes [Mon, 14 Dec 2020 14:48:59 +0000 (14:48 +0000)]
Convert id column for oauth_nonces to bigint

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

4 years agoUpdate bundle
Tom Hughes [Thu, 10 Dec 2020 14:40:16 +0000 (14:40 +0000)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Dec 2020 12:56:16 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoEnable dependabot for github actions
Tom Hughes [Wed, 9 Dec 2020 22:47:52 +0000 (22:47 +0000)]
Enable dependabot for github actions

4 years agoRemove travis-ci support
Tom Hughes [Wed, 9 Dec 2020 22:45:14 +0000 (22:45 +0000)]
Remove travis-ci support

4 years agoMove coveralls submission to actions workflow
Tom Hughes [Wed, 9 Dec 2020 22:44:31 +0000 (22:44 +0000)]
Move coveralls submission to actions workflow

4 years agoAdd actions workflow to run tests
Tom Hughes [Thu, 21 Nov 2019 19:38:03 +0000 (19:38 +0000)]
Add actions workflow to run tests

4 years agoAdd actions workflow to run lint tools
Tom Hughes [Wed, 9 Dec 2020 16:51:51 +0000 (16:51 +0000)]
Add actions workflow to run lint tools

4 years agoMerge remote-tracking branch 'upstream/pull/2999'
Tom Hughes [Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2999'

4 years agoMerge remote-tracking branch 'upstream/pull/2997' into master
Tom Hughes [Tue, 8 Dec 2020 15:30:59 +0000 (15:30 +0000)]
Merge remote-tracking branch 'upstream/pull/2997' into master

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 8 Dec 2020 15:01:22 +0000 (16:01 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAdd missing html suffix to translation key
Andy Allan [Tue, 8 Dec 2020 13:50:22 +0000 (13:50 +0000)]
Add missing html suffix to translation key

The new key was added to the translations config file in a previous commit.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Dec 2020 14:56:26 +0000 (15:56 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2996' into master
Tom Hughes [Sun, 6 Dec 2020 19:21:29 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2996' into master

4 years agoBump eslint from 7.14.0 to 7.15.0
dependabot[bot] [Sun, 6 Dec 2020 18:57:28 +0000 (18:57 +0000)]
Bump eslint from 7.14.0 to 7.15.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.14.0 to 7.15.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.14.0...v7.15.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate bundle
Tom Hughes [Sun, 6 Dec 2020 18:53:36 +0000 (18:53 +0000)]
Update bundle

Pin rubcop to 0.x to avoid erb_lint issues

4 years agoDisable dependabot for ruby gems
Tom Hughes [Sun, 6 Dec 2020 18:47:51 +0000 (18:47 +0000)]
Disable dependabot for ruby gems

Closes #2992

4 years agoMerge remote-tracking branch 'upstream/pull/2993' into master
Tom Hughes [Sun, 6 Dec 2020 18:44:33 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/2993' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2991' into master
Tom Hughes [Sun, 6 Dec 2020 18:37:45 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/2991' into master

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Dec 2020 14:51:48 +0000 (15:51 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAvoid using raw in html mailer views
Andy Allan [Wed, 2 Dec 2020 15:13:09 +0000 (15:13 +0000)]
Avoid using raw in html mailer views

Use the _html suffix to mark that we expect the translations to contain links.

Unfortunately, we can't use the _html keys for the plain text emails, since the input options (e.g. username, url) will be html-escaped,
before it is passed to the view. So we need to use non-html-suffix keys for the plaintext views, in most cases. Only when the translation
options (e.g. url) are guaranteed to not contain any escapable characters can the same translation key be shared.

4 years agoAdd a test for i18n interpolation into plain and html parts
Andy Allan [Wed, 2 Dec 2020 13:02:25 +0000 (13:02 +0000)]
Add a test for i18n interpolation into plain and html parts

I spent some time working on an alternative translation strategy, without realising some of the plain text implications.

4 years agoMerge pull request #2969 from tuckerrc/diary-updated-date
Andy Allan [Wed, 2 Dec 2020 11:30:22 +0000 (11:30 +0000)]
Merge pull request #2969 from tuckerrc/diary-updated-date

Add last updated date to diary entry page

4 years agoBump aws-sdk-s3 from 1.85.0 to 1.86.0
dependabot[bot] [Wed, 2 Dec 2020 05:01:33 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.85.0 to 1.86.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.86.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 agoMerge remote-tracking branch 'upstream/pull/2989' into master
Tom Hughes [Tue, 1 Dec 2020 22:26:02 +0000 (22:26 +0000)]
Merge remote-tracking branch 'upstream/pull/2989' into master

4 years agoImprove guessing of labels for Nominatim results
Sarah Hoffmann [Tue, 1 Dec 2020 21:37:09 +0000 (22:37 +0100)]
Improve guessing of labels for Nominatim results

This adapts to two changes in place handling by Nominatim:

* Place links that are computed by Nominatim are now found in
  extratags['linked_places']. Keep the check for extratags['place']
  as this may contain an explicitly mapped place label.
* Use address rank for guessing the admin level. This gets normalised
  by Nominatim with respect to country-specific use of admin_level.

Also adds additional labels for admin levels, so that we now have
complete coverage for all levels that are in use in OSM.

4 years agoMerge remote-tracking branch 'upstream/pull/2988' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:59 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2988' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2987' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:56 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2987' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2986' into master
Tom Hughes [Tue, 1 Dec 2020 08:18:53 +0000 (08:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2986' into master

4 years agoBump puma from 5.0.4 to 5.1.0
dependabot[bot] [Tue, 1 Dec 2020 05:00:58 +0000 (05:00 +0000)]
Bump puma from 5.0.4 to 5.1.0

Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.1.0.
- [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.0.4...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Nov 2020 16:11:29 +0000 (17:11 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoBump listen from 3.3.1 to 3.3.3
dependabot[bot] [Mon, 30 Nov 2020 05:03:14 +0000 (05:03 +0000)]
Bump listen from 3.3.1 to 3.3.3

Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump rubocop-performance from 1.9.0 to 1.9.1
dependabot[bot] [Mon, 30 Nov 2020 05:02:46 +0000 (05:02 +0000)]
Bump rubocop-performance from 1.9.0 to 1.9.1

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.9.0 to 1.9.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.9.0...v1.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2985' into master
Tom Hughes [Fri, 27 Nov 2020 08:53:16 +0000 (08:53 +0000)]
Merge remote-tracking branch 'upstream/pull/2985' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2984' into master
Tom Hughes [Fri, 27 Nov 2020 08:53:13 +0000 (08:53 +0000)]
Merge remote-tracking branch 'upstream/pull/2984' into master

4 years agoBump autoprefixer-rails from 10.0.2.0 to 10.0.3.0
dependabot[bot] [Fri, 27 Nov 2020 05:02:12 +0000 (05:02 +0000)]
Bump autoprefixer-rails from 10.0.2.0 to 10.0.3.0

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.2.0 to 10.0.3.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.2.0...10.0.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump capybara from 3.33.0 to 3.34.0
dependabot[bot] [Fri, 27 Nov 2020 05:01:30 +0000 (05:01 +0000)]
Bump capybara from 3.33.0 to 3.34.0

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.33.0...3.34.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate translate string and only show if different from creation time
Tucker Chapman [Fri, 27 Nov 2020 03:04:54 +0000 (22:04 -0500)]
Update translate string and only show if different from creation time

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Nov 2020 17:03:18 +0000 (18:03 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAvoid calling raw in plain text email templates
Andy Allan [Wed, 25 Nov 2020 14:37:38 +0000 (14:37 +0000)]
Avoid calling raw in plain text email templates

Rails doesn't escape text in text/plain outputs, since before Rails 4.

See https://github.com/rails/rails/pull/8235

4 years agoRemove duplicate translation strings, and use short form translation lookups
Andy Allan [Wed, 25 Nov 2020 14:17:41 +0000 (14:17 +0000)]
Remove duplicate translation strings, and use short form translation lookups

4 years agoRename subject translation key, for consistency
Andy Allan [Wed, 25 Nov 2020 14:02:49 +0000 (14:02 +0000)]
Rename subject translation key, for consistency

4 years agoUse rails t helper to allow relative translation keys in email subjects
Andy Allan [Wed, 25 Nov 2020 13:45:45 +0000 (13:45 +0000)]
Use rails t helper to allow relative translation keys in email subjects

This makes it easier to rename methods and translation keys.

4 years agoMerge remote-tracking branch 'upstream/pull/2983' into master
Tom Hughes [Wed, 25 Nov 2020 16:59:23 +0000 (16:59 +0000)]
Merge remote-tracking branch 'upstream/pull/2983' into master

4 years agoAllow smtp settings to be configured through the settings system
Andy Allan [Wed, 25 Nov 2020 16:12:07 +0000 (16:12 +0000)]
Allow smtp settings to be configured through the settings system

This allows easier configuration using the settings.local.yml files

Fixes #2571

4 years agoMerge remote-tracking branch 'upstream/pull/2970' into master
Tom Hughes [Wed, 25 Nov 2020 15:18:39 +0000 (15:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2970' into master

4 years agoMerge pull request #2971 from tomhughes/table
Andy Allan [Wed, 25 Nov 2020 11:55:05 +0000 (11:55 +0000)]
Merge pull request #2971 from tomhughes/table

Add bootstrap classes to markdown tables

4 years agoFix trace tag interpolation, and add a test
Andy Allan [Wed, 25 Nov 2020 11:34:35 +0000 (11:34 +0000)]
Fix trace tag interpolation, and add a test

4 years agoMerge remote-tracking branch 'upstream/pull/2981' into master
Tom Hughes [Wed, 25 Nov 2020 10:20:59 +0000 (10:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2981' into master

4 years agoBump strong_migrations from 0.7.2 to 0.7.3
dependabot[bot] [Wed, 25 Nov 2020 05:01:17 +0000 (05:01 +0000)]
Bump strong_migrations from 0.7.2 to 0.7.3

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.2...v0.7.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Nov 2020 14:29:08 +0000 (15:29 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2976' into master
Tom Hughes [Mon, 23 Nov 2020 08:14:52 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2976' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2975' into master
Tom Hughes [Mon, 23 Nov 2020 08:14:47 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2975' into master

4 years agoBump eslint from 7.13.0 to 7.14.0
dependabot[bot] [Mon, 23 Nov 2020 05:04:33 +0000 (05:04 +0000)]
Bump eslint from 7.13.0 to 7.14.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.13.0 to 7.14.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.13.0...v7.14.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.84.1 to 1.85.0
dependabot[bot] [Mon, 23 Nov 2020 05:02:29 +0000 (05:02 +0000)]
Bump aws-sdk-s3 from 1.84.1 to 1.85.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.1 to 1.85.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 agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Nov 2020 14:55:28 +0000 (15:55 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAdd bootstrap classes to markdown tables
Tom Hughes [Thu, 19 Nov 2020 10:17:21 +0000 (10:17 +0000)]
Add bootstrap classes to markdown tables

4 years agoRefactor trace notifications to reduce lego translations
Andy Allan [Wed, 18 Nov 2020 18:07:15 +0000 (18:07 +0000)]
Refactor trace notifications to reduce lego translations

Fixes #2268.

Unfortunately there's still a lego translation when both halves of the sentence are joined together, but this at least reduces the number of combinations to translate.

4 years agoAdd last updated date to diary entry page
Tucker Chapman [Wed, 18 Nov 2020 01:33:27 +0000 (20:33 -0500)]
Add last updated date to diary entry page

4 years agoFix erblint warning
Tom Hughes [Tue, 17 Nov 2020 09:23:22 +0000 (09:23 +0000)]
Fix erblint warning

4 years agoFix new rubocop warnings
Tom Hughes [Tue, 17 Nov 2020 08:17:34 +0000 (08:17 +0000)]
Fix new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2967' into master
Tom Hughes [Tue, 17 Nov 2020 08:14:44 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2967' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2966' into master
Tom Hughes [Tue, 17 Nov 2020 08:14:41 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2966' into master

4 years agoBump rubocop-performance from 1.8.1 to 1.9.0
dependabot[bot] [Tue, 17 Nov 2020 05:01:07 +0000 (05:01 +0000)]
Bump rubocop-performance from 1.8.1 to 1.9.0

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.8.1 to 1.9.0.
- [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.1...v1.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Nov 2020 14:24:21 +0000 (15:24 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoBump listen from 3.3.0 to 3.3.1
dependabot[bot] [Mon, 16 Nov 2020 05:54:53 +0000 (05:54 +0000)]
Bump listen from 3.3.0 to 3.3.1

Bumps [listen](https://github.com/guard/listen) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoAdd updated authentication logos
mxdanger [Sat, 14 Nov 2020 04:02:00 +0000 (20:02 -0800)]
Add updated authentication logos

4 years agoFix HTML escaping issues with user role icons
Tom Hughes [Fri, 13 Nov 2020 15:13:37 +0000 (15:13 +0000)]
Fix HTML escaping issues with user role icons

4 years agoPrefer string interpolation to concatenation
Tom Hughes [Fri, 13 Nov 2020 11:32:28 +0000 (11:32 +0000)]
Prefer string interpolation to concatenation

4 years agoImprove readability
Tom Hughes [Fri, 13 Nov 2020 10:51:01 +0000 (10:51 +0000)]
Improve readability

4 years agoMerge remote-tracking branch 'upstream/pull/2921' into master
Tom Hughes [Fri, 13 Nov 2020 10:49:35 +0000 (10:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2921' into master

4 years agoPrefer keyword arguments when method has optional boolean arguments
Tom Hughes [Fri, 13 Nov 2020 10:14:10 +0000 (10:14 +0000)]
Prefer keyword arguments when method has optional boolean arguments

4 years agoMerge remote-tracking branch 'upstream/pull/2955' into master
Tom Hughes [Fri, 13 Nov 2020 09:52:18 +0000 (09:52 +0000)]
Merge remote-tracking branch 'upstream/pull/2955' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2958' into master
Tom Hughes [Fri, 13 Nov 2020 09:49:30 +0000 (09:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2958' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2957' into master
Tom Hughes [Fri, 13 Nov 2020 09:49:10 +0000 (09:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2957' into master

4 years agoBump webmock from 3.9.5 to 3.10.0
dependabot[bot] [Fri, 13 Nov 2020 05:03:47 +0000 (05:03 +0000)]
Bump webmock from 3.9.5 to 3.10.0

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0.
- [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.5...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump composite_primary_keys from 12.0.2 to 12.0.3
dependabot[bot] [Fri, 13 Nov 2020 05:03:07 +0000 (05:03 +0000)]
Bump composite_primary_keys from 12.0.2 to 12.0.3

Bumps [composite_primary_keys](https://github.com/drnic/composite_primary_keys) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/drnic/composite_primary_keys/releases)
- [Changelog](https://github.com/composite-primary-keys/composite_primary_keys/blob/master/History.rdoc)
- [Commits](https://github.com/drnic/composite_primary_keys/compare/12.0.2...12.0.3)

Signed-off-by: dependabot[bot] <support@github.com>