rails.git
2 years agoMerge remote-tracking branch 'upstream/pull/1827'
Tom Hughes [Wed, 18 Apr 2018 19:21:52 +0000 (20:21 +0100)]
Merge remote-tracking branch 'upstream/pull/1827'

2 years agoMerge remote-tracking branch 'upstream/pull/1826'
Tom Hughes [Wed, 18 Apr 2018 17:38:50 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1826'

2 years agoImprove formatting
Tom Hughes [Wed, 18 Apr 2018 17:37:18 +0000 (18:37 +0100)]
Improve formatting

2 years agoMerge remote-tracking branch 'upstream/pull/1824'
Tom Hughes [Wed, 18 Apr 2018 17:36:22 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1824'

2 years agoUse lazy translation lookups for the user_blocks partials.
Andy Allan [Wed, 18 Apr 2018 06:20:41 +0000 (14:20 +0800)]
Use lazy translation lookups for the user_blocks partials.

2 years agoPluralise user_preferences_controller
Andy Allan [Wed, 18 Apr 2018 03:22:37 +0000 (11:22 +0800)]
Pluralise user_preferences_controller

This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention

2 years agoMove the default_url_options config to the action_mailer initializer
Andy Allan [Wed, 18 Apr 2018 02:29:59 +0000 (10:29 +0800)]
Move the default_url_options config to the action_mailer initializer

We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.

2 years agoFix for empty array when querying for local community geometries
Bryan Housel [Mon, 16 Apr 2018 19:49:14 +0000 (15:49 -0400)]
Fix for empty array when querying for local community geometries

2 years agoAllow changeset source tag to be settable via url api
Bryan Housel [Mon, 16 Apr 2018 18:49:12 +0000 (14:49 -0400)]
Allow changeset source tag to be settable via url api
(see https://github.com/openstreetmap/iD/issues/4899)

2 years agoUpdate to iD v2.8.0
Bryan Housel [Mon, 16 Apr 2018 18:43:49 +0000 (14:43 -0400)]
Update to iD v2.8.0

2 years agoAllow trusted addresses for better_errors to be set in the environment
Tom Hughes [Sun, 15 Apr 2018 21:22:43 +0000 (22:22 +0100)]
Allow trusted addresses for better_errors to be set in the environment

2 years agoMerge remote-tracking branch 'upstream/pull/1815'
Tom Hughes [Sun, 15 Apr 2018 20:26:38 +0000 (21:26 +0100)]
Merge remote-tracking branch 'upstream/pull/1815'

2 years agoMerge remote-tracking branch 'upstream/pull/1820'
Tom Hughes [Sun, 15 Apr 2018 18:57:37 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/1820'

2 years agoMerge remote-tracking branch 'upstream/pull/1816'
Tom Hughes [Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)]
Merge remote-tracking branch 'upstream/pull/1816'

2 years agoMerge remote-tracking branch 'upstream/pull/1814'
Tom Hughes [Sun, 15 Apr 2018 18:52:31 +0000 (19:52 +0100)]
Merge remote-tracking branch 'upstream/pull/1814'

2 years agoRemove error class when right-click-selecting destination
J Guthrie [Sun, 15 Apr 2018 17:05:25 +0000 (18:05 +0100)]
Remove error class when right-click-selecting destination

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 17:26:02 +0000 (19:26 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 13:33:08 +0000 (15:33 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 07:24:37 +0000 (09:24 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAlter class to avoid conflict with model test class
Andy Allan [Wed, 11 Apr 2018 08:05:13 +0000 (16:05 +0800)]
Alter class to avoid conflict with model test class

2 years agoSet default_url_options for action_mailer
Andy Allan [Wed, 11 Apr 2018 07:53:30 +0000 (15:53 +0800)]
Set default_url_options for action_mailer

This saves having to repeat the same host and protocol options
throughout the notifiers

2 years agoAdd better_errors gem for easier debugging
Andy Allan [Wed, 11 Apr 2018 06:07:38 +0000 (14:07 +0800)]
Add better_errors gem for easier debugging

2 years agoFix handling of title when replying to diary entries
Andy Allan [Wed, 11 Apr 2018 06:03:17 +0000 (14:03 +0800)]
Fix handling of title when replying to diary entries

2 years agoRefactor @this_user to @user
Andy Allan [Wed, 11 Apr 2018 03:42:33 +0000 (11:42 +0800)]
Refactor @this_user to @user

Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Apr 2018 06:27:07 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAsk for confirmation before deleting a trace
Tom Hughes [Thu, 5 Apr 2018 20:16:28 +0000 (21:16 +0100)]
Ask for confirmation before deleting a trace

Fixes #1812

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Apr 2018 07:31:53 +0000 (09:31 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/1804'
Tom Hughes [Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1804'

2 years agoMerge remote-tracking branch 'upstream/pull/1801'
Tom Hughes [Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)]
Merge remote-tracking branch 'upstream/pull/1801'

2 years agoTweak highlighting of geolocation errors
Tom Hughes [Mon, 2 Apr 2018 14:24:03 +0000 (15:24 +0100)]
Tweak highlighting of geolocation errors

2 years agoMerge remote-tracking branch 'upstream/pull/1800'
Tom Hughes [Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1800'

2 years agoAdded autoPan for Directions markers
J Guthrie [Sat, 31 Mar 2018 21:18:25 +0000 (22:18 +0100)]
Added autoPan for Directions markers

2 years agoAdded missing onramp instructions to locale file
J Guthrie [Sat, 31 Mar 2018 15:31:35 +0000 (16:31 +0100)]
Added missing onramp instructions to locale file

2 years agoMoved inline styling to stylesheet
J Guthrie [Thu, 29 Mar 2018 21:48:39 +0000 (22:48 +0100)]
Moved inline styling to stylesheet

2 years agoRemove/replace redundant no_place locale translation
J Guthrie [Thu, 29 Mar 2018 21:27:33 +0000 (22:27 +0100)]
Remove/replace redundant no_place locale translation

2 years agoUnlocateable place now highlighted in red and specified in error message
J Guthrie [Thu, 29 Mar 2018 19:50:29 +0000 (20:50 +0100)]
Unlocateable place now highlighted in red and specified in error message

The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place

2 years agoMerge remote-tracking branch 'upstream/pull/1796'
Tom Hughes [Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)]
Merge remote-tracking branch 'upstream/pull/1796'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Mar 2018 07:16:45 +0000 (09:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/1799'
Tom Hughes [Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1799'

2 years agoMerge remote-tracking branch 'upstream/pull/1798'
Tom Hughes [Wed, 28 Mar 2018 16:33:35 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1798'

2 years agoMerge remote-tracking branch 'upstream/pull/1797'
Tom Hughes [Wed, 28 Mar 2018 16:33:01 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1797'

2 years agoMerge remote-tracking branch 'upstream/pull/1795'
Tom Hughes [Wed, 28 Mar 2018 16:23:21 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1795'

2 years agoStrip trailing whitespace from multiline html translations
Andy Allan [Wed, 28 Mar 2018 09:16:17 +0000 (17:16 +0800)]
Strip trailing whitespace from multiline html translations

2 years agoBe more consistent with 'my' vs 'your' for objects that belong to
Andy Allan [Wed, 28 Mar 2018 09:07:50 +0000 (17:07 +0800)]
Be more consistent with 'my' vs 'your' for objects that belong to
the user

2 years agoUse named paths for a few trace links
Andy Allan [Wed, 28 Mar 2018 08:55:10 +0000 (16:55 +0800)]
Use named paths for a few trace links

2 years agoMove the api routes into the api/0.6 scope
Andy Allan [Wed, 28 Mar 2018 07:38:10 +0000 (15:38 +0800)]
Move the api routes into the api/0.6 scope

2 years agoRemove unnecessary route aliases
Andy Allan [Wed, 28 Mar 2018 07:29:24 +0000 (15:29 +0800)]
Remove unnecessary route aliases

These simply duplicate the aliases that are set by default.

2 years agoUse concise route definitions for single method routes
Andy Allan [Wed, 28 Mar 2018 07:03:32 +0000 (15:03 +0800)]
Use concise route definitions for single method routes

2 years agoDisable image_optim workers in tests
Andy Allan [Wed, 28 Mar 2018 05:52:51 +0000 (13:52 +0800)]
Disable image_optim workers in tests

They aren't needed for anything related to testing, and the warnings
about missing binaries adds noise to the test output.

2 years agoRemove image_optim config loading override
Andy Allan [Wed, 28 Mar 2018 05:50:26 +0000 (13:50 +0800)]
Remove image_optim config loading override

image_optim_rails loads the config files by default, and has a
built-in mechanism for per-environment configs. Forcing the config
loading in this way is unnecessary.

2 years agoSilence puma startup messages when running tests
Andy Allan [Wed, 28 Mar 2018 05:30:31 +0000 (13:30 +0800)]
Silence puma startup messages when running tests

2 years agoFix new rubocop warnings
Tom Hughes [Mon, 26 Mar 2018 18:00:03 +0000 (19:00 +0100)]
Fix new rubocop warnings

2 years agoUpdate rubocop
Tom Hughes [Mon, 26 Mar 2018 17:49:50 +0000 (18:49 +0100)]
Update rubocop

2 years agoRevert to dalli 2.7.6
Tom Hughes [Mon, 26 Mar 2018 08:20:34 +0000 (09:20 +0100)]
Revert to dalli 2.7.6

2 years agoUpdate bundle
Tom Hughes [Mon, 26 Mar 2018 07:51:27 +0000 (08:51 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Mar 2018 06:19:11 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/1788'
Tom Hughes [Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1788'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Mar 2018 07:19:26 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUse user_path links. Fixes #1785
Andy Allan [Wed, 21 Mar 2018 03:05:46 +0000 (11:05 +0800)]
Use user_path links. Fixes #1785

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Mar 2018 20:07:35 +0000 (21:07 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Mar 2018 15:10:33 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Mar 2018 08:10:50 +0000 (09:10 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to iD v2.7.1
Bryan Housel [Sun, 11 Mar 2018 15:58:48 +0000 (11:58 -0400)]
Update to iD v2.7.1

2 years agoMerge branch 'pull/1765'
Andy Allan [Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)]
Merge branch 'pull/1765'

2 years agoSimplify redirect.
Andy Allan [Fri, 9 Mar 2018 07:56:56 +0000 (15:56 +0800)]
Simplify redirect.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Mar 2018 08:43:51 +0000 (09:43 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAdded support for 2 more secondary wikidata tag links
Štefan Baebler [Sun, 4 Mar 2018 23:01:19 +0000 (00:01 +0100)]
Added support for 2 more secondary wikidata tag links

Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata

2 years agoUpdate to iD v2.7.0
Bryan Housel [Fri, 2 Mar 2018 23:06:44 +0000 (18:06 -0500)]
Update to iD v2.7.0

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Mar 2018 08:32:42 +0000 (09:32 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoValidate user location is sensible
Tom Hughes [Sun, 4 Mar 2018 10:53:14 +0000 (10:53 +0000)]
Validate user location is sensible

2 years agoUse home_tile to find nearby users
Tom Hughes [Sun, 4 Feb 2018 16:03:16 +0000 (16:03 +0000)]
Use home_tile to find nearby users

2 years agoMake OSM::GreatCircle#bounds return a BoundingBox object
Tom Hughes [Sun, 4 Feb 2018 15:54:13 +0000 (15:54 +0000)]
Make OSM::GreatCircle#bounds return a BoundingBox object

2 years agoAdd an indexed home_tile column to the user table
Tom Hughes [Sun, 4 Feb 2018 15:49:12 +0000 (15:49 +0000)]
Add an indexed home_tile column to the user table

2 years agoChange test case
biswesh456 [Sat, 3 Mar 2018 14:50:52 +0000 (20:20 +0530)]
Change test case

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Mar 2018 07:22:44 +0000 (08:22 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/1772'
Tom Hughes [Tue, 27 Feb 2018 20:37:53 +0000 (20:37 +0000)]
Merge remote-tracking branch 'upstream/pull/1772'

2 years agoMove abbr style from border to text-decoration
Holger Jeromin [Tue, 27 Feb 2018 20:25:03 +0000 (21:25 +0100)]
Move abbr style from border to text-decoration

2 years agoMerge remote-tracking branch 'upstream/pull/1769'
Tom Hughes [Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)]
Merge remote-tracking branch 'upstream/pull/1769'

2 years agoRemove underline from abbr elements
Tom Hughes [Tue, 27 Feb 2018 20:19:52 +0000 (20:19 +0000)]
Remove underline from abbr elements

Fixes #1771

2 years agoTrace everywhere in potlatch too
Aaron Lidman [Tue, 27 Feb 2018 06:42:29 +0000 (22:42 -0800)]
Trace everywhere in potlatch too

2 years agoUse trace consistently, closes #1644
Aaron Lidman [Tue, 27 Feb 2018 06:42:03 +0000 (22:42 -0800)]
Use trace consistently, closes #1644

2 years agoExclude hidden diary entries and comments from spam scoring
Tom Hughes [Mon, 26 Feb 2018 22:35:06 +0000 (22:35 +0000)]
Exclude hidden diary entries and comments from spam scoring

2 years agoUse bolded version of destinations
Tom Hughes [Sun, 25 Feb 2018 21:29:54 +0000 (21:29 +0000)]
Use bolded version of destinations

2 years agoFix translation keys for on ramps
Tom Hughes [Sun, 25 Feb 2018 20:56:17 +0000 (20:56 +0000)]
Fix translation keys for on ramps

2 years agoUpdate to rails 5.1.5
Tom Hughes [Sun, 25 Feb 2018 20:52:22 +0000 (20:52 +0000)]
Update to rails 5.1.5

2 years agoShow exit numbers for off ramps in OSRM directions
Tom Hughes [Sun, 25 Feb 2018 20:51:11 +0000 (20:51 +0000)]
Show exit numbers for off ramps in OSRM directions

Fixes #1768

2 years agoUpdate wiki page data
Mateusz Konieczny [Sat, 24 Feb 2018 18:31:09 +0000 (19:31 +0100)]
Update wiki page data

Closes #1767

2 years agoAllow admins and moderators to delete traces
biswesh456 [Sat, 24 Feb 2018 15:06:12 +0000 (20:36 +0530)]
Allow admins and moderators to delete traces

Fixes #1625

2 years agoMerge pull request #1758 from ardean80/patch-1
Andy Allan [Fri, 23 Feb 2018 03:01:11 +0000 (11:01 +0800)]
Merge pull request #1758 from ardean80/patch-1

Update country.rb

2 years agoMerge pull request #1732 from tomhughes/npemap
Andy Allan [Fri, 23 Feb 2018 02:23:22 +0000 (10:23 +0800)]
Merge pull request #1732 from tomhughes/npemap

Remove npemap as a source for UK postcodes

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Feb 2018 11:21:36 +0000 (12:21 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2018 08:22:31 +0000 (09:22 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAdd libffi to requirements
Tom Hughes [Sun, 18 Feb 2018 10:22:34 +0000 (10:22 +0000)]
Add libffi to requirements

2 years agoUpdate country.rb
ardean80 [Fri, 16 Feb 2018 13:43:53 +0000 (14:43 +0100)]
Update country.rb

Without adding "Rails.root.join(...)" (or something else returning a complete path to the countries.xml file) this error occurred:
"No such file or directory @ rb_sysopen - config/countries.xml"
I think it happened because it could not find that file through a relative path.

2 years agoFix route path 'hovering' when marker positions are changed
Jamie Guthrie [Wed, 14 Feb 2018 19:54:53 +0000 (19:54 +0000)]
Fix route path 'hovering' when marker positions are changed

Closes #1755

2 years agoFix directions for roundabout without exit number
Jamie Guthrie [Thu, 15 Feb 2018 09:53:00 +0000 (09:53 +0000)]
Fix directions for roundabout without exit number

Closes #1756

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Feb 2018 09:00:41 +0000 (10:00 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Wed, 14 Feb 2018 21:14:47 +0000 (21:14 +0000)]
Update bundle

2 years agoAvoid relying on global state to detect when we are dragging
Tom Hughes [Wed, 14 Feb 2018 17:58:01 +0000 (17:58 +0000)]
Avoid relying on global state to detect when we are dragging

We can't guarantee what order getRoute calls will finish in so
relying on global state is dangerous - capture it in the closure
instead so that each route knows what it is doing.

2 years agoStop map zooming out after dropping marker
Tom Hughes [Wed, 14 Feb 2018 01:19:30 +0000 (01:19 +0000)]
Stop map zooming out after dropping marker

Closes #1751