]> git.openstreetmap.org Git - rails.git/log
rails.git
13 months agoMake search input a direct child of input group
Anton Khorev [Sat, 16 Sep 2023 14:40:07 +0000 (17:40 +0300)]
Make search input a direct child of input group

13 months agoMerge remote-tracking branch 'upstream/pull/4261'
Tom Hughes [Fri, 29 Sep 2023 09:05:31 +0000 (10:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4261'

13 months agoUpgrade to bootstrap 5.2
Andy Allan [Wed, 20 Sep 2023 14:59:24 +0000 (15:59 +0100)]
Upgrade to bootstrap 5.2

13 months agoMerge remote-tracking branch 'upstream/pull/4264'
Tom Hughes [Thu, 28 Sep 2023 20:15:52 +0000 (21:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4264'

13 months agoFix border settings used in workaround
Andy Allan [Thu, 28 Sep 2023 20:01:41 +0000 (21:01 +0100)]
Fix border settings used in workaround

Fixes #4263

13 months agoMerge remote-tracking branch 'upstream/pull/4260'
Tom Hughes [Thu, 28 Sep 2023 15:35:05 +0000 (16:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4260'

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Sep 2023 11:19:02 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoMerge pull request #3690 from AntonKhorev/search-form-no-group
Andy Allan [Wed, 27 Sep 2023 16:36:35 +0000 (17:36 +0100)]
Merge pull request #3690 from AntonKhorev/search-form-no-group

Stick search input and Go button together with flex instead of input group

13 months agoMerge pull request #4201 from AntonKhorev/issues-limit-settings
Andy Allan [Wed, 27 Sep 2023 14:47:44 +0000 (15:47 +0100)]
Merge pull request #4201 from AntonKhorev/issues-limit-settings

Move max value of issues counter to settings

13 months agoMerge pull request #4249 from AntonKhorev/no-traces-nav-empty-li
Andy Allan [Wed, 27 Sep 2023 14:33:58 +0000 (15:33 +0100)]
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li

Change traces feed and upload button alignment

13 months agoMerge pull request #4184 from AntonKhorev/print
Andy Allan [Wed, 27 Sep 2023 14:10:52 +0000 (15:10 +0100)]
Merge pull request #4184 from AntonKhorev/print

Show sidebar in print media

13 months agoWorkaround for dartsass vs bootstrap 5.1 bug
Andy Allan [Wed, 27 Sep 2023 08:23:26 +0000 (09:23 +0100)]
Workaround for dartsass vs bootstrap 5.1 bug

13 months agoSwitch from sassc-rails to dartsass-sprockets
Andy Allan [Wed, 20 Sep 2023 14:26:58 +0000 (15:26 +0100)]
Switch from sassc-rails to dartsass-sprockets

sassc-rails, and its underlying libsass, is deprecated. dartsass-sprockets
allows us to use the currently maintained dartsass implementation,
without having to change any of our toolchain.

The version of sass-embedded is pinned to avoid warnings in bootstrap. When
we upgrade bootstrap versions, we can upgrade sass-embedded to match.

13 months agoInstall git in Docker to allow git repos in Gemfile
Andy Allan [Wed, 20 Sep 2023 15:50:44 +0000 (16:50 +0100)]
Install git in Docker to allow git repos in Gemfile

13 months agoFix new rubocop warnings
Tom Hughes [Tue, 26 Sep 2023 17:35:05 +0000 (18:35 +0100)]
Fix new rubocop warnings

13 months agoUpdate bundle
Tom Hughes [Tue, 26 Sep 2023 17:21:09 +0000 (18:21 +0100)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Sep 2023 11:17:56 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/4258'
Tom Hughes [Sun, 24 Sep 2023 17:34:50 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4258'

14 months agoBump eslint from 8.49.0 to 8.50.0
dependabot[bot] [Fri, 22 Sep 2023 23:47:53 +0000 (23:47 +0000)]
Bump eslint from 8.49.0 to 8.50.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.49.0 to 8.50.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.49.0...v8.50.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoAdd whitespace
Tom Hughes [Fri, 22 Sep 2023 16:54:18 +0000 (17:54 +0100)]
Add whitespace

14 months agoMerge remote-tracking branch 'upstream/pull/4255'
Tom Hughes [Fri, 22 Sep 2023 16:45:42 +0000 (17:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4255'

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Sep 2023 11:32:19 +0000 (13:32 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoAdd Tracestrack Topo as featured layer
Paul Norman [Wed, 20 Sep 2023 05:16:42 +0000 (22:16 -0700)]
Add Tracestrack Topo as featured layer

14 months agoUpdate leaflet-osm repo owner
Paul Norman [Wed, 20 Sep 2023 04:56:54 +0000 (21:56 -0700)]
Update leaflet-osm repo owner

14 months agoDrop rubocop config patch now that rubocop-factory_bot is fixed
Tom Hughes [Tue, 19 Sep 2023 10:32:23 +0000 (11:32 +0100)]
Drop rubocop config patch now that rubocop-factory_bot is fixed

14 months agoUpdate bundle
Tom Hughes [Tue, 19 Sep 2023 09:48:09 +0000 (10:48 +0100)]
Update bundle

14 months agoLimit SOTM EU banner to one month
Tom Hughes [Tue, 19 Sep 2023 08:33:20 +0000 (09:33 +0100)]
Limit SOTM EU banner to one month

14 months agoAllow banners to have a start date as well as an end date
Tom Hughes [Tue, 19 Sep 2023 08:33:03 +0000 (09:33 +0100)]
Allow banners to have a start date as well as an end date

14 months agoAdd banner for State of the Map Europe 2023
Marjan Van de Kauter [Tue, 19 Sep 2023 08:17:30 +0000 (09:17 +0100)]
Add banner for State of the Map Europe 2023

Closes #4252

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Sep 2023 11:18:08 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoTweak sizes and alignment of traces rss/upload buttons
Anton Khorev [Thu, 14 Sep 2023 18:00:57 +0000 (21:00 +0300)]
Tweak sizes and alignment of traces rss/upload buttons

14 months agoMerge remote-tracking branch 'upstream/pull/4240'
Tom Hughes [Thu, 14 Sep 2023 16:42:04 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4240'

14 months agoMerge remote-tracking branch 'upstream/pull/4247'
Tom Hughes [Thu, 14 Sep 2023 16:09:31 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/4247'

14 months agoUse start margin instead of empty <li> for gap before traces rss button
Anton Khorev [Thu, 14 Sep 2023 15:02:55 +0000 (18:02 +0300)]
Use start margin instead of empty <li> for gap before traces rss button

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Sep 2023 11:22:37 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoRefactor remaining sass division operators to use multiplication
Andy Allan [Wed, 13 Sep 2023 12:26:19 +0000 (13:26 +0100)]
Refactor remaining sass division operators to use multiplication

14 months agoRemove unusual margins and line-height from comments
Andy Allan [Wed, 13 Sep 2023 12:18:30 +0000 (13:18 +0100)]
Remove unusual margins and line-height from comments

This allows them to follow normal conventions used elsewhere, as
well as removing some custom css.

14 months agoRemove sass division for export input boxes margins
Andy Allan [Wed, 13 Sep 2023 10:42:12 +0000 (11:42 +0100)]
Remove sass division for export input boxes margins

14 months agoRemove custom styling from export alternative sources dl
Andy Allan [Wed, 13 Sep 2023 10:35:55 +0000 (11:35 +0100)]
Remove custom styling from export alternative sources dl

These were mostly the same as the bootstrap defaults.

14 months agoRefactor the directions table to use bootstrap table styling
Andy Allan [Wed, 13 Sep 2023 10:30:50 +0000 (11:30 +0100)]
Refactor the directions table to use bootstrap table styling

This allows us to remove some custom CSS

14 months agoUse spacer for margins on leaflet popups
Andy Allan [Thu, 7 Sep 2023 09:26:50 +0000 (10:26 +0100)]
Use spacer for margins on leaflet popups

14 months agoUse an inline list for the login auth buttons
Andy Allan [Wed, 6 Sep 2023 17:35:12 +0000 (18:35 +0100)]
Use an inline list for the login auth buttons

14 months agoUse multiplication for secondary-actions margin and padding
Andy Allan [Wed, 6 Sep 2023 17:23:22 +0000 (18:23 +0100)]
Use multiplication for secondary-actions margin and padding

This avoids using the sass division operator, which is deprecated.

14 months agoRemove unnecessary paragraph margin override on diary comments
Andy Allan [Wed, 6 Sep 2023 17:22:58 +0000 (18:22 +0100)]
Remove unnecessary paragraph margin override on diary comments

14 months agoUpdate bundle
Tom Hughes [Tue, 12 Sep 2023 17:12:06 +0000 (18:12 +0100)]
Update bundle

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Sep 2023 11:18:30 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/4239'
Tom Hughes [Sun, 10 Sep 2023 17:47:07 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4239'

14 months agoMerge remote-tracking branch 'upstream/pull/4245'
Tom Hughes [Sun, 10 Sep 2023 16:24:16 +0000 (17:24 +0100)]
Merge remote-tracking branch 'upstream/pull/4245'

14 months agoMerge remote-tracking branch 'upstream/pull/4243'
Tom Hughes [Sun, 10 Sep 2023 16:23:24 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/4243'

14 months agoMerge remote-tracking branch 'upstream/pull/4242'
Tom Hughes [Sun, 10 Sep 2023 16:22:21 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4242'

14 months agoUpdate to rails 7.0.8
Tom Hughes [Sun, 10 Sep 2023 16:11:17 +0000 (17:11 +0100)]
Update to rails 7.0.8

14 months agoAdd comment ids to changeset discussion api responses
Anton Khorev [Sun, 10 Sep 2023 14:10:31 +0000 (17:10 +0300)]
Add comment ids to changeset discussion api responses

14 months agoRemove authorize_web call from traces api controller
Anton Khorev [Sat, 9 Sep 2023 16:40:28 +0000 (19:40 +0300)]
Remove authorize_web call from traces api controller

14 months agoAdd json output for show user block api
Anton Khorev [Sat, 9 Sep 2023 13:41:10 +0000 (16:41 +0300)]
Add json output for show user block api

14 months agoAdd show user block api endpoint
Anton Khorev [Fri, 8 Sep 2023 12:25:15 +0000 (15:25 +0300)]
Add show user block api endpoint

14 months agoCombine comments and traces pagination partials
Anton Khorev [Mon, 4 Sep 2023 13:25:35 +0000 (16:25 +0300)]
Combine comments and traces pagination partials

14 months agoDon't interpolate in pagination partial
Anton Khorev [Mon, 4 Sep 2023 12:41:09 +0000 (15:41 +0300)]
Don't interpolate in pagination partial

14 months agoMake pagination partial view
Anton Khorev [Mon, 4 Sep 2023 12:07:54 +0000 (15:07 +0300)]
Make pagination partial view

14 months agoRefactor diary paging queries
Anton Khorev [Mon, 4 Sep 2023 11:13:43 +0000 (14:13 +0300)]
Refactor diary paging queries

14 months agoChange diary comments pagination to before/after id
Anton Khorev [Mon, 4 Sep 2023 10:12:25 +0000 (13:12 +0300)]
Change diary comments pagination to before/after id

14 months agoBump eslint from 8.48.0 to 8.49.0
dependabot[bot] [Fri, 8 Sep 2023 23:16:24 +0000 (23:16 +0000)]
Bump eslint from 8.48.0 to 8.49.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.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.48.0...v8.49.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoMerge remote-tracking branch 'upstream/pull/4241'
Tom Hughes [Fri, 8 Sep 2023 17:09:00 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/4241'

14 months agoMerge remote-tracking branch 'upstream/pull/4236'
Tom Hughes [Fri, 8 Sep 2023 16:55:54 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4236'

14 months agoMerge remote-tracking branch 'upstream/pull/4237'
Tom Hughes [Fri, 8 Sep 2023 16:53:42 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4237'

14 months agoAdd user id to api trace output
Anton Khorev [Fri, 8 Sep 2023 14:13:57 +0000 (17:13 +0300)]
Add user id to api trace output

14 months agoBump coverallsapp/github-action from 2.2.2 to 2.2.3
dependabot[bot] [Thu, 7 Sep 2023 23:46:21 +0000 (23:46 +0000)]
Bump coverallsapp/github-action from 2.2.2 to 2.2.3

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.2...v2.2.3)

---
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>
14 months agoFix alignment in profile and diary location forms
Anton Khorev [Thu, 7 Sep 2023 14:20:43 +0000 (17:20 +0300)]
Fix alignment in profile and diary location forms

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Sep 2023 11:26:57 +0000 (13:26 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoHandle timeouts inside a view for API calls
Tom Hughes [Wed, 6 Sep 2023 23:32:11 +0000 (00:32 +0100)]
Handle timeouts inside a view for API calls

14 months agoMerge remote-tracking branch 'upstream/pull/4225'
Tom Hughes [Wed, 6 Sep 2023 17:42:29 +0000 (18:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4225'

14 months agoMerge remote-tracking branch 'upstream/pull/4234'
Tom Hughes [Wed, 6 Sep 2023 17:36:28 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4234'

14 months agoMerge remote-tracking branch 'upstream/pull/4233'
Tom Hughes [Wed, 6 Sep 2023 17:36:25 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4233'

14 months agoMatch the top spacing of the leaflet buttons to the gap between groups
Andy Allan [Wed, 6 Sep 2023 15:32:43 +0000 (16:32 +0100)]
Match the top spacing of the leaflet buttons to the gap between groups

This removes a usage of sass division operator

14 months agoUse h2 as the main header on the map-ui panel
Andy Allan [Wed, 6 Sep 2023 15:32:04 +0000 (16:32 +0100)]
Use h2 as the main header on the map-ui panel

14 months agoUse standard padding size for map-ui sidebar
Andy Allan [Wed, 6 Sep 2023 15:29:47 +0000 (16:29 +0100)]
Use standard padding size for map-ui sidebar

The previous padding didn't match the main sidebar, and also used
sass division as part of the calculation.

14 months agoRound the clickable map previews on the layer switcher
Andy Allan [Wed, 6 Sep 2023 15:26:12 +0000 (16:26 +0100)]
Round the clickable map previews on the layer switcher

Most interactive elements on the site are rounded, so we can do the
same for these map previews.

14 months agoMake the sharing controls read-only
Andy Allan [Wed, 6 Sep 2023 14:59:23 +0000 (15:59 +0100)]
Make the sharing controls read-only

They aren't used for inputting any information, only for copying.

14 months agoUse bootstrap form controls for the link and html controls
Andy Allan [Wed, 6 Sep 2023 14:55:16 +0000 (15:55 +0100)]
Use bootstrap form controls for the link and html controls

14 months agoUse bootstrap for share forms
Andy Allan [Wed, 6 Sep 2023 14:31:49 +0000 (15:31 +0100)]
Use bootstrap for share forms

This fixes alignment of the checkboxes, and uses bootstrap form
controls for the image format and scale inputs.

Move the custom dimensions input to beside the custom dimensions
display.

14 months agoMute hidden comment text in each table cell
Anton Khorev [Tue, 5 Sep 2023 08:50:58 +0000 (11:50 +0300)]
Mute hidden comment text in each table cell

14 months agoFix lack of margin on changeset browsing messages
Andy Allan [Wed, 6 Sep 2023 15:43:20 +0000 (16:43 +0100)]
Fix lack of margin on changeset browsing messages

The display area here uses negative margins to make the flush list
work, so we need to add them back in for normal text.

14 months agoMerge remote-tracking branch 'upstream/pull/4232'
Tom Hughes [Wed, 6 Sep 2023 09:43:43 +0000 (10:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4232'

14 months agoUse implicit style for associations with factory overrides
Andy Allan [Wed, 6 Sep 2023 09:20:23 +0000 (10:20 +0100)]
Use implicit style for associations with factory overrides

This matches our usage of implicit style for associations generally,
e.g. `user`.

14 months agoMerge remote-tracking branch 'upstream/pull/4230'
Tom Hughes [Tue, 5 Sep 2023 16:30:03 +0000 (17:30 +0100)]
Merge remote-tracking branch 'upstream/pull/4230'

14 months agoMerge remote-tracking branch 'upstream/pull/4231'
Tom Hughes [Tue, 5 Sep 2023 16:22:04 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4231'

14 months agoUpdate argon2 tests for change in library default costs
Tom Hughes [Tue, 5 Sep 2023 16:16:53 +0000 (17:16 +0100)]
Update argon2 tests for change in library default costs

14 months agoUpdate bundle
Tom Hughes [Tue, 5 Sep 2023 15:54:41 +0000 (16:54 +0100)]
Update bundle

14 months agoShow user id on profile pages to moderators and admins
Anton Khorev [Tue, 5 Sep 2023 10:35:08 +0000 (13:35 +0300)]
Show user id on profile pages to moderators and admins

14 months agoMute hidden comment text in each table cell
Anton Khorev [Tue, 5 Sep 2023 08:50:58 +0000 (11:50 +0300)]
Mute hidden comment text in each table cell

14 months agoMerge remote-tracking branch 'upstream/pull/4229'
Tom Hughes [Tue, 5 Sep 2023 07:26:06 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4229'

14 months agoMerge remote-tracking branch 'upstream/pull/4228'
Tom Hughes [Tue, 5 Sep 2023 07:26:02 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4228'

14 months agoBump coverallsapp/github-action from 2.2.1 to 2.2.2
dependabot[bot] [Mon, 4 Sep 2023 23:17:23 +0000 (23:17 +0000)]
Bump coverallsapp/github-action from 2.2.1 to 2.2.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.1...v2.2.2)

---
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>
14 months agoBump actions/checkout from 3 to 4
dependabot[bot] [Mon, 4 Sep 2023 23:17:21 +0000 (23:17 +0000)]
Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
14 months agoSwap older/newer diary entries buttons
Anton Khorev [Mon, 4 Sep 2023 13:32:54 +0000 (16:32 +0300)]
Swap older/newer diary entries buttons

14 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Sep 2023 11:19:10 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.

14 months agoMerge remote-tracking branch 'upstream/pull/4223'
Tom Hughes [Sun, 3 Sep 2023 17:55:39 +0000 (18:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4223'

14 months agoMerge remote-tracking branch 'upstream/pull/4222'
Tom Hughes [Sun, 3 Sep 2023 17:54:18 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4222'

14 months agoMerge remote-tracking branch 'upstream/pull/4221'
Tom Hughes [Sun, 3 Sep 2023 17:52:54 +0000 (18:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4221'

14 months agoRemove unused partial _user.atom.builder
Anton Khorev [Sun, 3 Sep 2023 11:47:35 +0000 (14:47 +0300)]
Remove unused partial _user.atom.builder

14 months agoAdd bbox parameter to notes search api
Anton Khorev [Fri, 1 Sep 2023 12:48:07 +0000 (15:48 +0300)]
Add bbox parameter to notes search api