rails.git
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Nov 2017 08:17:04 +0000 (09:17 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoWhen no cache store is set use cookie storage for sessions
Drew Dara-Abrams [Thu, 2 Nov 2017 00:07:29 +0000 (17:07 -0700)]
When no cache store is set use cookie storage for sessions

A change in the default configuration of development environments
in rails 5.1 means that caching is now disabled by default so in
that case fall back to using cookies instead.

Closes #1666

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Nov 2017 07:26:40 +0000 (08:26 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoChange wording for hosting partners
JamesKingdom [Wed, 1 Nov 2017 20:39:36 +0000 (20:39 +0000)]
Change wording for hosting partners

2 years agoRelax cookie security policy
Tom Hughes [Wed, 1 Nov 2017 17:44:22 +0000 (17:44 +0000)]
Relax cookie security policy

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Oct 2017 08:19:18 +0000 (09:19 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoFix rubocop warnings
Tom Hughes [Sun, 29 Oct 2017 19:43:02 +0000 (19:43 +0000)]
Fix rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Sun, 29 Oct 2017 19:35:26 +0000 (19:35 +0000)]
Update bundle

2 years agoReplace factory_girl with factory_bot
Tom Hughes [Sun, 29 Oct 2017 19:29:30 +0000 (19:29 +0000)]
Replace factory_girl with factory_bot

2 years agoAvoid using rinku's auto_link helper
Tom Hughes [Fri, 27 Oct 2017 18:45:32 +0000 (19:45 +0100)]
Avoid using rinku's auto_link helper

It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.

2 years agoUpdate for ActionView::Template::Error change
Tom Hughes [Fri, 27 Oct 2017 18:21:19 +0000 (19:21 +0100)]
Update for ActionView::Template::Error change

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 27 Oct 2017 03:06:42 +0000 (05:06 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoConvert session timeout to seconds when it is set
Tom Hughes [Wed, 25 Oct 2017 07:59:29 +0000 (08:59 +0100)]
Convert session timeout to seconds when it is set

This avoids problems if the rails Duration class changes
representation between different versions of rails.

2 years agoMerge remote-tracking branch 'upstream/pull/1652'
Tom Hughes [Wed, 25 Oct 2017 07:16:33 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/1652'

2 years agoMerge remote-tracking branch 'upstream/pull/1659'
Tom Hughes [Tue, 24 Oct 2017 19:19:46 +0000 (20:19 +0100)]
Merge remote-tracking branch 'upstream/pull/1659'

2 years agoMerge remote-tracking branch 'upstream/pull/1658'
Tom Hughes [Tue, 24 Oct 2017 18:41:46 +0000 (19:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1658'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Oct 2017 03:15:48 +0000 (05:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRubocop fixes
Andy Allan [Sun, 22 Oct 2017 21:35:34 +0000 (22:35 +0100)]
Rubocop fixes

2 years agoAdd annotate gem and associated rake task. Annotate models.
Andy Allan [Sun, 22 Oct 2017 21:18:26 +0000 (22:18 +0100)]
Add annotate gem and associated rake task. Annotate models.

2 years agoAvoid using or comparing explicit model ids
Andy Allan [Sun, 22 Oct 2017 20:58:09 +0000 (21:58 +0100)]
Avoid using or comparing explicit model ids

The code is easier to read using higher-level concepts.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Oct 2017 07:17:15 +0000 (09:17 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRemoves DOM difference in location button (main map)
Holger Jeromin [Wed, 18 Oct 2017 17:51:05 +0000 (19:51 +0200)]
Removes DOM difference in location button (main map)

2 years agoRemoves DOM difference in location button
Holger Jeromin [Wed, 18 Oct 2017 13:05:11 +0000 (15:05 +0200)]
Removes DOM difference in location button

2 years agoAdd rails version number to migrations
Tom Hughes [Mon, 9 Oct 2017 20:08:53 +0000 (21:08 +0100)]
Add rails version number to migrations

2 years agoUpdate to rails 5.1.4
Tom Hughes [Mon, 9 Oct 2017 20:03:46 +0000 (21:03 +0100)]
Update to rails 5.1.4

2 years agoMerge remote-tracking branch 'upstream/pull/1651'
Tom Hughes [Mon, 16 Oct 2017 18:08:37 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1651'

2 years agoMerge remote-tracking branch 'upstream/pull/1580'
Tom Hughes [Mon, 16 Oct 2017 18:08:32 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/1580'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Oct 2017 08:49:29 +0000 (10:49 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAdd banner for OSMF Membership Drive
Bryan Housel [Mon, 16 Oct 2017 05:07:07 +0000 (01:07 -0400)]
Add banner for OSMF Membership Drive

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Oct 2017 06:51:51 +0000 (08:51 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to iD v2.4.3
Bryan Housel [Mon, 9 Oct 2017 22:08:24 +0000 (18:08 -0400)]
Update to iD v2.4.3

2 years agoUse send_data for GPX traces intead of monkey patching send_file
Tom Hughes [Mon, 9 Oct 2017 19:38:08 +0000 (20:38 +0100)]
Use send_data for GPX traces intead of monkey patching send_file

2 years agoImprove user_image_url test
Tom Hughes [Mon, 9 Oct 2017 18:10:32 +0000 (19:10 +0100)]
Improve user_image_url test

Use a user that actually has an image and updated the expect
output to match that.

2 years agoRemove reference to large screen stylesheet
Tom Hughes [Mon, 9 Oct 2017 12:47:48 +0000 (13:47 +0100)]
Remove reference to large screen stylesheet

The separate large screen stylesheet was removed in 4dceacdeb but
we are still referencing it on Internet Explorer.

2 years agoFix typo that means fe0f4543c1 has never worked
Tom Hughes [Mon, 9 Oct 2017 07:39:14 +0000 (08:39 +0100)]
Fix typo that means fe0f4543c1 has never worked

2 years agoUpdate to iD v2.4.2
Bryan Housel [Mon, 9 Oct 2017 02:32:32 +0000 (22:32 -0400)]
Update to iD v2.4.2

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Oct 2017 06:41:47 +0000 (08:41 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUse Hash#dig to simplify code
Tom Hughes [Thu, 5 Oct 2017 19:22:24 +0000 (20:22 +0100)]
Use Hash#dig to simplify code

2 years agoRepair bundle
Tom Hughes [Thu, 5 Oct 2017 18:31:52 +0000 (19:31 +0100)]
Repair bundle

2 years agoFix rubocop warnings
Tom Hughes [Thu, 5 Oct 2017 18:18:38 +0000 (19:18 +0100)]
Fix rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Thu, 5 Oct 2017 07:32:51 +0000 (08:32 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 5 Oct 2017 06:02:25 +0000 (08:02 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoDrop geocoder.us from search engines
Tom Hughes [Mon, 25 Sep 2017 21:52:03 +0000 (22:52 +0100)]
Drop geocoder.us from search engines

Fixes #1633

2 years agoAdd banner-sotmus2017.png
Ian Dees [Thu, 14 Sep 2017 19:43:22 +0000 (14:43 -0500)]
Add banner-sotmus2017.png

2 years agoDelete banner-sotm-2017.png
Ian Dees [Thu, 14 Sep 2017 19:42:05 +0000 (14:42 -0500)]
Delete banner-sotm-2017.png

2 years agoAdd SOTM US and remove SOTM.org
Ian Dees [Thu, 14 Sep 2017 19:39:47 +0000 (14:39 -0500)]
Add SOTM US and remove SOTM.org

2 years agoDefer measuring of header elements to a timeout
Tom Hughes [Thu, 14 Sep 2017 19:30:38 +0000 (20:30 +0100)]
Defer measuring of header elements to a timeout

Chrome 60 and later seem to fire the "ready" callback before the DOM is
fully ready causing us to measure the wrong sizes for the header elements
so we use a 0ms timeout to defer the measurement slightly as a workaround.

Fixes #1639

2 years agoAdd banner for State of the Map Asia 2017
Kshitiz Khanal [Mon, 4 Sep 2017 07:05:26 +0000 (12:50 +0545)]
Add banner for State of the Map Asia 2017

Closes #1630

2 years agoAdd padding between the last diary post and the pagination links
Wille Marcel [Fri, 8 Sep 2017 01:14:33 +0000 (22:14 -0300)]
Add padding between the last diary post and the pagination links

Closes #1634

2 years agoUpdate secure_headers configuration for upstream changes
Tom Hughes [Fri, 8 Sep 2017 15:49:28 +0000 (16:49 +0100)]
Update secure_headers configuration for upstream changes

2 years agoUpdate travis configuration to work on trusty based builders
Tom Hughes [Fri, 8 Sep 2017 14:38:25 +0000 (15:38 +0100)]
Update travis configuration to work on trusty based builders

Switch to postgres 9.5 and link postgres functions to a directory
that is accessible to the postgres server.

2 years agoUpdate rails to 5.0.6
Tom Hughes [Fri, 8 Sep 2017 14:08:47 +0000 (15:08 +0100)]
Update rails to 5.0.6

2 years agoMerge remote-tracking branch 'upstream/pull/1614'
Tom Hughes [Wed, 30 Aug 2017 20:09:32 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/pull/1614'

2 years agoRename xml processing methods with an update_ prefix
Andy Allan [Wed, 30 Aug 2017 10:40:54 +0000 (11:40 +0100)]
Rename xml processing methods with an update_ prefix

They behave differently from the other from_xml methods on other models.

2 years agoEnable retina tiles for Thunderforest layers
Tom Hughes [Tue, 29 Aug 2017 19:28:06 +0000 (20:28 +0100)]
Enable retina tiles for Thunderforest layers

Fixes #1623

2 years agoUpdate to iD v2.4.1
Bryan Housel [Sat, 26 Aug 2017 20:08:43 +0000 (16:08 -0400)]
Update to iD v2.4.1

2 years agoAdd iD hashtags parameter
Bryan Housel [Fri, 25 Aug 2017 20:24:19 +0000 (16:24 -0400)]
Add iD hashtags parameter

2 years agoUpdate to iD v2.4.0
Bryan Housel [Fri, 25 Aug 2017 20:21:11 +0000 (16:21 -0400)]
Update to iD v2.4.0

2 years agoRefactor the from_xml methods to act on existing trace objects.
Andy Allan [Fri, 18 Aug 2017 09:08:54 +0000 (10:08 +0100)]
Refactor the from_xml methods to act on existing trace objects.

Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.

Fixes #1600

2 years agoAdd failing test demonstrating tag duplication when updating traces via the API.
Andy Allan [Thu, 17 Aug 2017 18:03:50 +0000 (19:03 +0100)]
Add failing test demonstrating tag duplication when updating traces via the API.

2 years agoMake sure we show errors correctly when resetting a password
Tom Hughes [Fri, 11 Aug 2017 16:45:57 +0000 (17:45 +0100)]
Make sure we show errors correctly when resetting a password

2 years agoDiscard empty ways from query result geometries
mmd-osm [Thu, 10 Aug 2017 18:49:50 +0000 (19:49 +0100)]
Discard empty ways from query result geometries

Fixes #1608

2 years agoUpdate to leaflet 1.2.0
Tom Hughes [Wed, 9 Aug 2017 21:48:56 +0000 (22:48 +0100)]
Update to leaflet 1.2.0

2 years agoFix rubocop warning
Tom Hughes [Thu, 3 Aug 2017 18:08:54 +0000 (19:08 +0100)]
Fix rubocop warning

2 years agoSwitch to using openstreetmap-deadlock_retry
Tom Hughes [Thu, 3 Aug 2017 17:41:45 +0000 (18:41 +0100)]
Switch to using openstreetmap-deadlock_retry

Closes #1602

2 years agoMerge remote-tracking branch 'upstream/pull/1604'
Tom Hughes [Wed, 2 Aug 2017 14:38:21 +0000 (15:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1604'

2 years agoAdd maintainers to README
Andy Allan [Wed, 2 Aug 2017 14:34:17 +0000 (15:34 +0100)]
Add maintainers to README

It's nice to be explicit, so that new contributers know who is who.

While github shows "owner" and "member" labels these are for the
openstreetmap organisation as a whole, and can be misleading.

2 years agoMake sure the account form is POSTed
Tom Hughes [Wed, 2 Aug 2017 14:31:21 +0000 (15:31 +0100)]
Make sure the account form is POSTed

Fixes #1601

2 years agoMerge pull request #1588 from Georeactor/master
Andy Allan [Wed, 2 Aug 2017 14:15:25 +0000 (15:15 +0100)]
Merge pull request #1588 from Georeactor/master

Update gem, fix icons on RTL/Arabic pages

2 years agoMerge remote-tracking branch 'upstream/pull/1603'
Tom Hughes [Wed, 2 Aug 2017 14:02:39 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/1603'

2 years agoRemove unused user save template.
Andy Allan [Wed, 2 Aug 2017 13:48:04 +0000 (14:48 +0100)]
Remove unused user save template.

This template isn't used, since all the controller methods redirect
to other views.

2 years agoFix user settings form
Tom Hughes [Tue, 1 Aug 2017 18:23:41 +0000 (19:23 +0100)]
Fix user settings form

Fixes #1601

2 years agoUpdate to rails 5.0.5
Tom Hughes [Mon, 31 Jul 2017 20:55:40 +0000 (21:55 +0100)]
Update to rails 5.0.5

2 years agoUpdate bundle
Tom Hughes [Mon, 31 Jul 2017 20:55:32 +0000 (21:55 +0100)]
Update bundle

2 years agoUpdate rack-cors and fix tests for changes in behaviour
Tom Hughes [Mon, 31 Jul 2017 20:55:01 +0000 (21:55 +0100)]
Update rack-cors and fix tests for changes in behaviour

2 years agoMerge pull request #1597 from tomhughes/current-user
Andy Allan [Fri, 28 Jul 2017 11:42:33 +0000 (12:42 +0100)]
Merge pull request #1597 from tomhughes/current-user

Complete @user to current_user transition

2 years agoReplace @user with @current_user
Tom Hughes [Thu, 27 Jul 2017 18:44:14 +0000 (19:44 +0100)]
Replace @user with @current_user

This ensures that that we will find any more hidden references
to @user that might be hanging around...

2 years agoChange user forms to use current user instead of @user
Tom Hughes [Thu, 27 Jul 2017 18:40:20 +0000 (19:40 +0100)]
Change user forms to use current user instead of @user

2 years agoConvert @user to current_user in helpers
Tom Hughes [Thu, 27 Jul 2017 18:27:17 +0000 (19:27 +0100)]
Convert @user to current_user in helpers

2 years agoMerge remote-tracking branch 'upstream/pull/1595'
Tom Hughes [Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1595'

2 years agoConvert @user to current_user
Andy Allan [Thu, 27 Jul 2017 09:31:31 +0000 (10:31 +0100)]
Convert @user to current_user

2 years agoUse a current_user helper for accessing the logged in user in all views.
Andy Allan [Wed, 26 Jul 2017 10:54:31 +0000 (11:54 +0100)]
Use a current_user helper for accessing the logged in user in all views.

2 years agoConvert remaining controller code to use current_user
Andy Allan [Wed, 26 Jul 2017 09:58:04 +0000 (10:58 +0100)]
Convert remaining controller code to use current_user

The `self.current_user` is important when assigning to the current user,
to avoid creating a local variable called `current_user`

2 years agouse no-r2 comment to block RTL gem from changing sprites
Nick Doiron [Mon, 17 Jul 2017 23:51:54 +0000 (13:51 -1000)]
use no-r2 comment to block RTL gem from changing sprites

2 years agoUpdate to iD v2.3.2
Bryan Housel [Mon, 24 Jul 2017 22:55:40 +0000 (18:55 -0400)]
Update to iD v2.3.2

2 years agoUpdate to Leaflet.Locate 0.62.0
Christian Schmidt [Fri, 21 Jul 2017 18:29:07 +0000 (20:29 +0200)]
Update to Leaflet.Locate 0.62.0

2 years agoMark account suspended flash message as HTML safe
Tom Hughes [Tue, 18 Jul 2017 23:31:03 +0000 (00:31 +0100)]
Mark account suspended flash message as HTML safe

Fixes #1590

2 years agoClarify image dimensions
Bryan Housel [Mon, 17 Jul 2017 18:03:12 +0000 (14:03 -0400)]
Clarify image dimensions

2 years agoMerge remote-tracking branch 'upstream/pull/1587'
Tom Hughes [Mon, 17 Jul 2017 13:27:58 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1587'

2 years agonew png file for banner with square 350x350
Benoît [Mon, 17 Jul 2017 13:26:03 +0000 (15:26 +0200)]
new png file for banner with square 350x350

2 years agoDelete sotmlatam-2016.jpg
Benoît [Mon, 17 Jul 2017 11:35:41 +0000 (13:35 +0200)]
Delete sotmlatam-2016.jpg

2 years agoDelete sotmasia-2016.jpg
Benoît [Mon, 17 Jul 2017 11:35:29 +0000 (13:35 +0200)]
Delete sotmasia-2016.jpg

2 years agoDelete donate-2016.jpg
Benoît [Mon, 17 Jul 2017 11:35:19 +0000 (13:35 +0200)]
Delete donate-2016.jpg

2 years agoimage with proper width 350px
Benoît [Mon, 17 Jul 2017 11:34:48 +0000 (13:34 +0200)]
image with proper width 350px

2 years agoremove old entries in banner.yml
Benoît [Mon, 17 Jul 2017 11:19:07 +0000 (13:19 +0200)]
remove old entries in banner.yml

2 years agoadd sotm2017 in banner.yml
Benoît [Mon, 17 Jul 2017 11:17:53 +0000 (13:17 +0200)]
add sotm2017 in banner.yml

2 years agoadd png file with background
Benoît [Mon, 17 Jul 2017 11:13:11 +0000 (13:13 +0200)]
add png file with background

2 years agoAdd geoip_database key to example configuration
Tom Hughes [Sun, 16 Jul 2017 17:35:45 +0000 (18:35 +0100)]
Add geoip_database key to example configuration

Fixes #1586

2 years agoMerge remote-tracking branch 'upstream/pull/1583'
Tom Hughes [Wed, 12 Jul 2017 16:53:49 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1583'

2 years agoUse current_user to represent the currently logged in user.
Andy Allan [Wed, 12 Jul 2017 15:10:50 +0000 (16:10 +0100)]
Use current_user to represent the currently logged in user.

This is already used by the oauth plugin, and is a general rails convention.