]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 4 Dec 2019 19:01:26 +0000 (19:01 +0000)]
Remove version lock on autoprefixer-rails
Tom Hughes [Wed, 4 Dec 2019 18:42:47 +0000 (18:42 +0000)]
Update bundle
Tom Hughes [Wed, 4 Dec 2019 16:08:26 +0000 (16:08 +0000)]
Merge remote-tracking branch 'upstream/pull/2451'
Andy Allan [Wed, 4 Dec 2019 15:42:57 +0000 (16:42 +0100)]
Make the back button link to the inbox when reading received messages
Andy Allan [Wed, 4 Dec 2019 11:48:34 +0000 (12:48 +0100)]
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
Remove expand_bbox endpoint
Tom Hughes [Wed, 4 Dec 2019 11:33:31 +0000 (11:33 +0000)]
Merge remote-tracking branch 'upstream/pull/2450'
Andy Allan [Wed, 4 Dec 2019 10:59:18 +0000 (11:59 +0100)]
Use the conventional 'destroy' method name for destroying traces
Tom Hughes [Tue, 3 Dec 2019 22:54:04 +0000 (22:54 +0000)]
Replace content_tag_for with a simple tr element
translatewiki.net [Mon, 2 Dec 2019 08:39:56 +0000 (09:39 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Nov 2019 15:50:26 +0000 (16:50 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 27 Nov 2019 11:47:16 +0000 (11:47 +0000)]
Fix rubocop warnings
Tom Hughes [Wed, 27 Nov 2019 11:11:55 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2447'
Andy Allan [Wed, 27 Nov 2019 10:50:48 +0000 (11:50 +0100)]
Create an ApplicationRecord for models to inherit from
This is the default for Rails 5+, and also paves the way for
multiple database support.
Tom Hughes [Tue, 26 Nov 2019 18:56:12 +0000 (18:56 +0000)]
Drop bowser, which is no longer used
Guillaume Rischard [Tue, 26 Nov 2019 18:53:54 +0000 (18:53 +0000)]
Always use http to talk to josm
See discussion in #2445 and resulting conclusion that JOSM no
longer even listens on the https port.
Closes #2446
translatewiki.net [Mon, 25 Nov 2019 14:43:37 +0000 (15:43 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 25 Nov 2019 12:45:53 +0000 (12:45 +0000)]
Update to bowser 2.7.0
Tom Hughes [Mon, 25 Nov 2019 12:45:39 +0000 (12:45 +0000)]
Disable host validation in development mode
Tom Hughes [Sun, 24 Nov 2019 11:37:48 +0000 (11:37 +0000)]
Merge remote-tracking branch 'upstream/pull/2423'
Tom Hughes [Thu, 5 Sep 2019 20:23:49 +0000 (21:23 +0100)]
Errors have text/plain as the content type
Tom Hughes [Wed, 4 Sep 2019 13:45:46 +0000 (14:45 +0100)]
Fix some deprecation warnings
Tom Hughes [Tue, 20 Aug 2019 19:38:42 +0000 (20:38 +0100)]
Update to rails 6.0.1
Tom Hughes [Tue, 5 Nov 2019 18:19:52 +0000 (18:19 +0000)]
Drop use of record_tag_helper
We only had one place using it and there's no sign of
upstream doing a rails 6 compatible release.
Tom Hughes [Sun, 24 Nov 2019 11:04:35 +0000 (11:04 +0000)]
Fix rubocop warning
Tom Hughes [Sun, 24 Nov 2019 10:49:26 +0000 (10:49 +0000)]
Update bundle
Tom Hughes [Sun, 24 Nov 2019 10:41:33 +0000 (10:41 +0000)]
Switch to fork of actionpack-page_caching with rails 6 support
translatewiki.net [Thu, 21 Nov 2019 14:12:33 +0000 (15:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 20 Nov 2019 19:54:24 +0000 (19:54 +0000)]
Merge remote-tracking branch 'upstream/pull/2442'
Tom Hughes [Wed, 20 Nov 2019 19:17:29 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2434'
Tom Hughes [Wed, 20 Nov 2019 19:01:13 +0000 (19:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2440'
Tom Hughes [Wed, 20 Nov 2019 18:57:50 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2441'
Tom Hughes [Wed, 20 Nov 2019 18:56:42 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/2439'
hikemaniac [Wed, 20 Nov 2019 18:47:56 +0000 (19:47 +0100)]
Updated colours of landuse icons, added icon for natural=scrub
Tom Hughes [Thu, 14 Nov 2019 19:29:14 +0000 (19:29 +0000)]
Switch to using jbuilder for JSON templates
Andy Allan [Wed, 20 Nov 2019 15:31:46 +0000 (16:31 +0100)]
Move user preference XML generation to a view
Andy Allan [Wed, 20 Nov 2019 15:09:48 +0000 (16:09 +0100)]
Rename UserPreference controller methods to follow rails conventions more closely
Andy Allan [Wed, 20 Nov 2019 14:45:28 +0000 (15:45 +0100)]
Move Relation.to_xml and to_xml_node out of the model and into tests
Andy Allan [Wed, 20 Nov 2019 14:31:47 +0000 (15:31 +0100)]
Move Way.to_xml and to_xml_node out of the model and into tests
This code is only used in the tests. Refs #2433
Andy Allan [Wed, 20 Nov 2019 14:07:42 +0000 (15:07 +0100)]
Remove the users.nearby column
Refs #2417 and #2432
Tom Hughes [Wed, 20 Nov 2019 00:03:36 +0000 (00:03 +0000)]
Update bundle
Closes #2438
translatewiki.net [Mon, 18 Nov 2019 17:23:07 +0000 (18:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Nov 2019 19:06:50 +0000 (19:06 +0000)]
Update bundle
translatewiki.net [Thu, 14 Nov 2019 16:28:11 +0000 (17:28 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Nov 2019 12:24:50 +0000 (12:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2433'
Tom Hughes [Thu, 14 Nov 2019 12:20:10 +0000 (12:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2432'
Andy Allan [Wed, 13 Nov 2019 16:01:35 +0000 (17:01 +0100)]
Move Node.to_xml and to_xml_node out of model and into tests
This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.
Andy Allan [Wed, 21 Aug 2019 15:10:36 +0000 (17:10 +0200)]
Move the format tests to test the output from the controller
Andy Allan [Wed, 13 Nov 2019 13:19:32 +0000 (14:19 +0100)]
Ignore the users.nearby column
This is the first step of removing the column, see #2417. It needs to be
deployed before a migration to remove it, since the columns are
cached in ActiveRecord and things break if objects exist in memory
that expect the column to be there.
translatewiki.net [Mon, 11 Nov 2019 16:06:16 +0000 (17:06 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 10 Nov 2019 09:50:48 +0000 (09:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2429'
Tom Hughes [Sun, 10 Nov 2019 09:50:28 +0000 (09:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2428'
Chris Gadd [Sun, 10 Nov 2019 01:53:51 +0000 (14:53 +1300)]
Update hut icons
Enock Seth Nyamador [Sat, 9 Nov 2019 23:39:58 +0000 (23:39 +0000)]
fixed typo
Enock Seth Nyamador [Sat, 9 Nov 2019 23:37:30 +0000 (23:37 +0000)]
add SOTM Africa 2019 banner
mmd-osm [Sat, 9 Nov 2019 20:08:40 +0000 (21:08 +0100)]
Remove expand_bbox endpoint
Tom Hughes [Thu, 7 Nov 2019 19:26:03 +0000 (19:26 +0000)]
Merge remote-tracking branch 'upstream/pull/834'
translatewiki.net [Thu, 7 Nov 2019 15:22:42 +0000 (16:22 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 5 Nov 2019 18:55:32 +0000 (18:55 +0000)]
Update bundle
translatewiki.net [Mon, 4 Nov 2019 15:03:09 +0000 (16:03 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 1 Nov 2019 09:13:39 +0000 (09:13 +0000)]
Merge remote-tracking branch 'upstream/pull/2422'
Andy Allan [Fri, 1 Nov 2019 08:39:04 +0000 (09:39 +0100)]
Remove outdated reference to the external gpx importer
translatewiki.net [Thu, 31 Oct 2019 17:46:19 +0000 (18:46 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 30 Oct 2019 19:20:30 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2412'
Tom Hughes [Wed, 30 Oct 2019 19:20:11 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2418'
Tom Hughes [Wed, 30 Oct 2019 19:20:08 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2416'
Tom Hughes [Wed, 30 Oct 2019 19:16:03 +0000 (19:16 +0000)]
Update bundle
Andy Allan [Wed, 30 Oct 2019 14:44:43 +0000 (15:44 +0100)]
Add description of the nominatim key update process
Fixes #2119
Andy Allan [Wed, 30 Oct 2019 14:02:35 +0000 (15:02 +0100)]
Remove unused trace_optionals partial
Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.
translatewiki.net [Mon, 28 Oct 2019 15:38:58 +0000 (16:38 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 27 Oct 2019 18:59:35 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/2413'
translatewiki.net [Thu, 24 Oct 2019 20:14:22 +0000 (22:14 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Thu, 24 Oct 2019 03:43:28 +0000 (23:43 -0400)]
Update to iD v2.16.0
Tom Hughes [Wed, 23 Oct 2019 17:48:17 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/2403'
Tom Hughes [Wed, 23 Oct 2019 09:55:02 +0000 (10:55 +0100)]
Merge remote-tracking branch 'upstream/pull/2411'
Andy Allan [Wed, 23 Oct 2019 09:41:05 +0000 (11:41 +0200)]
Remove node/way/relation Search API
This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.
It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.
Andy Allan [Wed, 23 Oct 2019 09:26:16 +0000 (11:26 +0200)]
Convert various moderator? tests to use cancancan permissions checks
Andy Allan [Wed, 23 Oct 2019 08:52:12 +0000 (10:52 +0200)]
Convert various administator? tests to use cancancan permissions checks
Andy Allan [Wed, 23 Oct 2019 07:33:05 +0000 (09:33 +0200)]
Remove references to libpgosm during travis runs
These were removed from the structure file in
098e73479b466902cf48a07627f050dadd2fd73e
Tom Hughes [Tue, 22 Oct 2019 19:37:39 +0000 (20:37 +0100)]
Exclude node_modules form eslint checks
Tom Hughes [Tue, 22 Oct 2019 19:33:45 +0000 (20:33 +0100)]
Merge remote-tracking branch 'upstream/pull/2354'
Tom Hughes [Tue, 22 Oct 2019 19:29:00 +0000 (20:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2408'
Tom Hughes [Tue, 22 Oct 2019 19:20:30 +0000 (20:20 +0100)]
Update to sprockets 4.x
translatewiki.net [Mon, 21 Oct 2019 15:12:30 +0000 (17:12 +0200)]
Localisation updates from https://translatewiki.net.
Matt Amos [Mon, 21 Oct 2019 14:05:16 +0000 (15:05 +0100)]
Ooops, forgot to commit changes to db/structure.sql
Matt Amos [Mon, 21 Oct 2019 13:47:46 +0000 (14:47 +0100)]
Add pure SQL version of xid_to_int4.
Matt Amos [Mon, 21 Oct 2019 13:22:59 +0000 (14:22 +0100)]
Merge remote-tracking branch 'openstreetmap/master' into mac-os-x-install
Matt Amos [Mon, 21 Oct 2019 13:18:25 +0000 (14:18 +0100)]
Add section on using rbenv, separate from main installation instructions.
Tom Hughes [Mon, 21 Oct 2019 09:31:06 +0000 (10:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2400'
Andy Allan [Wed, 16 Oct 2019 14:43:51 +0000 (16:43 +0200)]
Rephrase note on vagrant providers, now that we support multiple providers
Tom Hughes [Sun, 20 Oct 2019 18:48:36 +0000 (19:48 +0100)]
Suppress new rubocop warning
Tom Hughes [Sun, 20 Oct 2019 18:44:28 +0000 (19:44 +0100)]
Update bundle
Tom Hughes [Sun, 20 Oct 2019 18:22:23 +0000 (19:22 +0100)]
Drop postgres 9.6 specific setting from structure.sql
Closes #2404
Tom Hughes [Sun, 20 Oct 2019 18:15:11 +0000 (19:15 +0100)]
Tidy up C database function support in travis
Tom Hughes [Sun, 20 Oct 2019 18:13:30 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2383'
Manfred Stock [Wed, 4 Sep 2019 20:49:18 +0000 (22:49 +0200)]
Update rubocop todo
The addition of the wikimedia_commons hyperlinking feature seems to trigger
the Metrics/ModuleLength check.
Manfred Stock [Wed, 12 Nov 2014 20:36:19 +0000 (21:36 +0100)]
Turn wikimedia_commons values into links
This turns the value of the 'wikimedia_commons' tag into a link to the
respective page on commons.wikimedia.org (if it is a 'File:' or 'Category:'
item) by enhancing the browse tags helper. See [1] for the tag description.
[1] http://wiki.openstreetmap.org/wiki/Key:wikimedia_commons
Matt Amos [Fri, 18 Oct 2019 15:25:30 +0000 (16:25 +0100)]
Fix installation instructions for Mac OS X
The installation of `libxml-ruby` was broken because it was picking up the system version of the libxml2 library. By setting a `bundler` config item, it's possible to point it to the right place.
Also updated the instructions for `phantomjs`, which Homebrew has moved to a cask (and is now not officially supported), and added some of the extra command line tools that are used (`pngcrush`, `optipng`, etc...)
translatewiki.net [Thu, 17 Oct 2019 18:10:51 +0000 (20:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 17 Oct 2019 11:16:28 +0000 (12:16 +0100)]
Allow administrators to see deleted diary comments
Tom Hughes [Wed, 16 Oct 2019 13:20:44 +0000 (14:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2398'