]>
git.openstreetmap.org Git - rails.git/log
Adam Hoyle [Sun, 17 Oct 2021 21:33:54 +0000 (22:33 +0100)]
Remove redundant route
Adam Hoyle [Sun, 17 Oct 2021 21:33:02 +0000 (22:33 +0100)]
Merge branch 'master' into feature/add-communities-page
Tom Hughes [Thu, 14 Oct 2021 23:12:09 +0000 (00:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3343'
dependabot[bot] [Thu, 14 Oct 2021 23:00:47 +0000 (23:00 +0000)]
Bump eslint from 8.0.0 to 8.0.1
Bumps [eslint](https://github.com/eslint/eslint) from 8.0.0 to 8.0.1.
- [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/v8.0.0...v8.0.1)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 14 Oct 2021 11:11:22 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 13 Oct 2021 18:25:36 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3341'
Tom Hughes [Wed, 13 Oct 2021 18:22:38 +0000 (19:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3340'
Andy Allan [Wed, 13 Oct 2021 16:36:48 +0000 (17:36 +0100)]
Use flexbox instead of floating to position the comment icon
This ensures both components get appropriate padding. Fixes #3305
Andy Allan [Wed, 29 Sep 2021 17:47:20 +0000 (18:47 +0100)]
Specify avatar dimensions in html tags
This prevents reflow when the images are loaded by the browser.
ActiveStorage variants are resized lazily when the image is requested,
so we only know the dimensions if the image was already loaded. This
means that there will be one reflow just after a new avatar is first
viewed.
Tom Hughes [Tue, 12 Oct 2021 17:16:22 +0000 (18:16 +0100)]
Update bundle
Tom Hughes [Tue, 12 Oct 2021 17:13:49 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3339'
dependabot[bot] [Mon, 11 Oct 2021 23:00:50 +0000 (23:00 +0000)]
Bump eslint from 7.32.0 to 8.0.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.0.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.32.0...v8.0.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 11 Oct 2021 11:10:35 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 7 Oct 2021 16:45:07 +0000 (17:45 +0100)]
Merge remote-tracking branch 'upstream/pull/3300'
translatewiki.net [Thu, 7 Oct 2021 11:10:39 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Oct 2021 14:05:34 +0000 (15:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3336'
Andy Allan [Wed, 6 Oct 2021 13:53:46 +0000 (14:53 +0100)]
Remove mention of trac in README
We no longer use or refer to trac, which has in the meantime been archived anyway.
Tom Hughes [Tue, 5 Oct 2021 17:16:53 +0000 (18:16 +0100)]
Update bundle
translatewiki.net [Mon, 4 Oct 2021 11:11:11 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Sep 2021 11:09:07 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 29 Sep 2021 18:10:22 +0000 (19:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3332'
Tom Hughes [Wed, 29 Sep 2021 18:07:44 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/3316'
Tom Hughes [Wed, 29 Sep 2021 17:54:56 +0000 (18:54 +0100)]
Fix new rubocop warning
Tom Hughes [Wed, 29 Sep 2021 17:51:34 +0000 (18:51 +0100)]
Update bundle
Andy Allan [Wed, 29 Sep 2021 14:25:28 +0000 (15:25 +0100)]
Move the tracepoint coordinate format test to the controller test
This allows us to remove the model method
Andy Allan [Wed, 29 Sep 2021 14:14:53 +0000 (15:14 +0100)]
Refactor tracepoint index to use an xml builder view
This avoids constructing xml by hand in both the controller and
the model, and opens the way for other rendering in future.
The complexity of deciding which point goes where, along with revisiting
previous tracks and tracksegs means that I've broken it down into
two parts - sorting the points into the right trksegs is done first,
before rendering them all as xml. I couldn't find a way to allow
revisiting using the builder.
Tom Hughes [Mon, 27 Sep 2021 21:31:40 +0000 (22:31 +0100)]
Merge remote-tracking branch 'upstream/pull/3331'
dependabot[bot] [Mon, 27 Sep 2021 21:16:53 +0000 (21:16 +0000)]
Bump ansi-regex from 5.0.0 to 5.0.1
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 27 Sep 2021 21:11:24 +0000 (22:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3330'
dependabot[bot] [Mon, 27 Sep 2021 20:42:52 +0000 (20:42 +0000)]
Bump nokogiri from 1.12.4 to 1.12.5
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Adam Hoyle [Mon, 27 Sep 2021 18:30:25 +0000 (19:30 +0100)]
Merge branch 'master' into feature/add-communities-page
translatewiki.net [Mon, 27 Sep 2021 11:11:19 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Sep 2021 11:11:33 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 21 Sep 2021 17:33:42 +0000 (18:33 +0100)]
Update bundle
translatewiki.net [Mon, 20 Sep 2021 11:10:19 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 16 Sep 2021 18:05:04 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3327'
Andy Allan [Thu, 16 Sep 2021 17:04:37 +0000 (18:04 +0100)]
Rename file so that it's included in test runs
Tom Hughes [Wed, 15 Sep 2021 17:44:23 +0000 (18:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3297'
Tom Hughes [Wed, 15 Sep 2021 17:38:25 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3324'
Tom Hughes [Wed, 15 Sep 2021 17:35:00 +0000 (18:35 +0100)]
Drop customisation for Rails/ContentTag
Tom Hughes [Wed, 15 Sep 2021 17:34:49 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/3323'
Andy Allan [Wed, 15 Sep 2021 16:05:11 +0000 (17:05 +0100)]
Remove the ObjectMetadata concern, since it's only used in tests now
Andy Allan [Wed, 15 Sep 2021 15:56:28 +0000 (16:56 +0100)]
Remove unused to_xml and to_xml_node methods from models
Andy Allan [Wed, 15 Sep 2021 15:55:00 +0000 (16:55 +0100)]
Move the xml format test for old nodes to the controller test
This allows us to remove the model method
Andy Allan [Wed, 15 Sep 2021 15:33:04 +0000 (16:33 +0100)]
Use a builder to render changeset downloads
Andy Allan [Wed, 15 Sep 2021 13:36:08 +0000 (14:36 +0100)]
Fix test
Andy Allan [Wed, 15 Sep 2021 13:30:32 +0000 (14:30 +0100)]
Use flexbox to position user thumbnails on the dashboard
This fixes a poor interaction involving lots of margins and the secondary-actions list
Andy Allan [Wed, 15 Sep 2021 13:29:15 +0000 (14:29 +0100)]
Refactor paragraph margin to avoid custom css
Andy Allan [Wed, 15 Sep 2021 13:11:05 +0000 (14:11 +0100)]
Restore the grey border around the user image on the profile page
This approach keeps the look without adding in the margins (and floats)
which are inappropriate for the flex-based layout.
Andy Allan [Wed, 15 Sep 2021 12:19:56 +0000 (13:19 +0100)]
Use an 'inline' dl to unify the appearance of the mapper and admin info details lines
Andy Allan [Wed, 15 Sep 2021 10:57:58 +0000 (11:57 +0100)]
Move the admin actions into line with the other links
This avoids wrapping them under the user profile picture
Andy Allan [Wed, 15 Sep 2021 10:40:40 +0000 (11:40 +0100)]
Merge pull request #179 from tomhughes/secondary-actions
Improve behaviour of secondary action lists when wrapping
Andy Allan [Wed, 15 Sep 2021 09:10:21 +0000 (10:10 +0100)]
Temporary pin on rubocop-rails until next bugfix release
There is a bug in the Rails/ContentTag cop that causes rubocop to crash. The bug has already been fixed and so should be available in the next release.
See https://github.com/rubocop/rubocop-rails/issues/543
Tom Hughes [Tue, 14 Sep 2021 19:31:26 +0000 (20:31 +0100)]
Update rubocop todo and fix new warnings
Tom Hughes [Tue, 14 Sep 2021 18:22:41 +0000 (19:22 +0100)]
Update bundle
translatewiki.net [Mon, 13 Sep 2021 11:09:50 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 12 Sep 2021 17:51:51 +0000 (18:51 +0100)]
Use autodetection for text files
Tom Hughes [Sun, 12 Sep 2021 17:50:06 +0000 (18:50 +0100)]
Merge remote-tracking branch 'upstream/pull/3313'
Tom Hughes [Sun, 12 Sep 2021 17:47:50 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/3285'
Tom Hughes [Sun, 12 Sep 2021 17:46:09 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3318'
Tom Hughes [Sun, 12 Sep 2021 17:41:05 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3317'
Morten Bruhn [Thu, 9 Sep 2021 20:01:13 +0000 (22:01 +0200)]
Added `crossing` as key
Morten Bruhn [Thu, 9 Sep 2021 18:53:11 +0000 (20:53 +0200)]
Added a couple of keys under `natural` to en.yml
translatewiki.net [Thu, 9 Sep 2021 11:10:03 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Paul Norman [Thu, 9 Sep 2021 03:05:47 +0000 (20:05 -0700)]
Add Fastly as top three donor
Dermot McNally [Wed, 8 Sep 2021 22:50:36 +0000 (23:50 +0100)]
Update en.yml
Updated (simplified) map tile attribution requirement to be the same as for any use of OSM data (based on request to LWG)
Adam Hoyle [Wed, 8 Sep 2021 19:28:28 +0000 (20:28 +0100)]
Improve encapsulation / location of osm-community-index files
Adam Hoyle [Wed, 8 Sep 2021 16:55:27 +0000 (17:55 +0100)]
Refactor osm-community-index and local chapters models
Tom Hughes [Tue, 7 Sep 2021 17:41:05 +0000 (18:41 +0100)]
Update bundle
Grant Slater [Tue, 7 Sep 2021 09:46:29 +0000 (10:46 +0100)]
Add gitattribute to force lf line endings
Grant Slater [Tue, 7 Sep 2021 09:46:02 +0000 (10:46 +0100)]
Add .editorconfig
translatewiki.net [Mon, 6 Sep 2021 11:09:45 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Sep 2021 11:10:23 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 2 Sep 2021 06:05:40 +0000 (07:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3308'
dependabot[bot] [Wed, 1 Sep 2021 23:00:55 +0000 (23:00 +0000)]
Bump js-cookie from 3.0.0 to 3.0.1
Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/master/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.0...v3.0.1)
---
updated-dependencies:
- dependency-name: js-cookie
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 1 Sep 2021 17:28:06 +0000 (18:28 +0100)]
Update bundle
translatewiki.net [Mon, 30 Aug 2021 11:15:19 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 22 Aug 2021 18:42:56 +0000 (19:42 +0100)]
Check that user email address are only returned with read_email
Tom Hughes [Sun, 1 Aug 2021 21:22:12 +0000 (22:22 +0100)]
Check that use of privileged scopes is restricted to administrators
Tom Hughes [Fri, 30 Jul 2021 21:42:45 +0000 (22:42 +0100)]
Add a privileged scope that allows authorization to be skipped
Tom Hughes [Fri, 30 Jul 2021 21:39:39 +0000 (22:39 +0100)]
Add a privileged scope that allows email addresses to be returned
Tom Hughes [Fri, 30 Jul 2021 21:24:51 +0000 (22:24 +0100)]
Introduce privileged scopes that only an administrator can enable
Adam Hoyle [Wed, 25 Aug 2021 21:00:41 +0000 (22:00 +0100)]
Prioritise strings[].name over strings[].community
Adam Hoyle [Wed, 25 Aug 2021 20:09:54 +0000 (21:09 +0100)]
Remove failed attempt to stop internal methods being public
Adam Hoyle [Wed, 25 Aug 2021 20:03:33 +0000 (21:03 +0100)]
Reinstate memoisation
Adam Hoyle [Tue, 24 Aug 2021 20:27:43 +0000 (21:27 +0100)]
Improve method privacy
Adam Hoyle [Tue, 24 Aug 2021 20:12:48 +0000 (21:12 +0100)]
Tidy
Adam Hoyle [Tue, 24 Aug 2021 19:55:18 +0000 (20:55 +0100)]
Update to latest osm-community-index
Adam Hoyle [Tue, 24 Aug 2021 19:55:09 +0000 (20:55 +0100)]
Localise local chapters
Tom Hughes [Tue, 24 Aug 2021 17:44:34 +0000 (18:44 +0100)]
Update bundle
Tom Hughes [Sun, 22 Aug 2021 14:40:33 +0000 (15:40 +0100)]
Improve testing of user details API responses
Tom Hughes [Tue, 24 Aug 2021 15:59:35 +0000 (16:59 +0100)]
Correct policing of access to private user details
translatewiki.net [Mon, 23 Aug 2021 11:11:11 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 21 Aug 2021 14:32:47 +0000 (15:32 +0100)]
Improve behaviour of secondary action lists when wrapping
Based on https://stackoverflow.com/a/
31732902 this ensure that when
a secondary action list wraps the additional lines don't start with
an item delimiter by pushing it to the left, outside of a parent nav
element which then hides it.
Tom Hughes [Sat, 21 Aug 2021 13:38:08 +0000 (14:38 +0100)]
Update to rails 6.1.4.1
Tom Hughes [Sat, 21 Aug 2021 13:36:27 +0000 (14:36 +0100)]
Update bundle
translatewiki.net [Thu, 19 Aug 2021 11:10:28 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 18 Aug 2021 14:29:17 +0000 (15:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3298'
Tom Hughes [Wed, 18 Aug 2021 14:12:43 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3296'
Andy Allan [Wed, 18 Aug 2021 13:30:35 +0000 (14:30 +0100)]
Convert account setting menu to tabs, and include on other pages
This makes it easier to navigate around these pages. Since each tab
corresponds to a given controller, this makes the selection of active
tabs straightforward.