rails.git
3 months agoDrop old user image columns
Tom Hughes [Tue, 16 Jul 2019 17:53:33 +0000 (18:53 +0100)]
Drop old user image columns

3 months agoReplace migrations that rely on models with rake tasks
Tom Hughes [Wed, 17 Jul 2019 17:55:15 +0000 (18:55 +0100)]
Replace migrations that rely on models with rake tasks

Replace some migrations that rely on relationships between
models to add subscriptions with rake tasks.

3 months agoDon't try and add fingerprints for user images
Tom Hughes [Wed, 17 Jul 2019 17:49:09 +0000 (18:49 +0100)]
Don't try and add fingerprints for user images

It won't actually work, and anybody migrating up to the current
schema is never going to use the fingerprints anyway.

3 months agoMerge remote-tracking branch 'upstream/pull/2320'
Tom Hughes [Wed, 17 Jul 2019 17:47:05 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2320'

3 months agoMerge remote-tracking branch 'upstream/pull/2322'
Tom Hughes [Wed, 17 Jul 2019 17:47:02 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2322'

3 months agoRework help page text
Andy Allan [Wed, 17 Jul 2019 17:37:59 +0000 (19:37 +0200)]
Rework help page text

This avoids using the OSM acronym, and uses better titles than urls
for the help forum and the wiki. Both titles are based on the title
of the linked sites.

3 months agoSet server_url to test.host in test environments
Tom Hughes [Wed, 17 Jul 2019 10:20:31 +0000 (11:20 +0100)]
Set server_url to test.host in test environments

Fixes #2319

3 months agoAvoid more models in old migrations
Andy Allan [Wed, 17 Jul 2019 10:16:20 +0000 (12:16 +0200)]
Avoid more models in old migrations

Although these migrations run fine today, they could break in the future
if changes are made to the current model code.

3 months agoAvoid using live models in old migrations
Andy Allan [Wed, 17 Jul 2019 09:52:02 +0000 (11:52 +0200)]
Avoid using live models in old migrations

Instead, we define models in the migrations themselves. This ensures that
column names etc match the state of the database during the migration,
not the current live version of the model.

3 months agoUpdate annotations after 91a37235ac748df7dc241b215790d6cbecd652f3
Andy Allan [Wed, 17 Jul 2019 08:39:10 +0000 (10:39 +0200)]
Update annotations after 91a37235ac748df7dc241b215790d6cbecd652f3

3 months agoUse the configured host name for user image URLs
Tom Hughes [Tue, 16 Jul 2019 21:41:37 +0000 (22:41 +0100)]
Use the configured host name for user image URLs

3 months agoRemove support for old style user images
Tom Hughes [Tue, 16 Jul 2019 17:45:41 +0000 (18:45 +0100)]
Remove support for old style user images

3 months agoUpdate gravatar methods to check for Active Storage images
Tom Hughes [Tue, 16 Jul 2019 17:34:50 +0000 (18:34 +0100)]
Update gravatar methods to check for Active Storage images

3 months agoReturn absolute URLs for user images
Tom Hughes [Tue, 16 Jul 2019 21:28:36 +0000 (22:28 +0100)]
Return absolute URLs for user images

3 months agoMerge remote-tracking branch 'upstream/pull/2313'
Tom Hughes [Tue, 16 Jul 2019 10:56:13 +0000 (11:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2313'

3 months agoDefer deletion of avatars to a background job
Tom Hughes [Tue, 16 Jul 2019 07:27:14 +0000 (08:27 +0100)]
Defer deletion of avatars to a background job

3 months agoIncrease expiry for Active Storage URLs
Tom Hughes [Tue, 16 Jul 2019 07:25:17 +0000 (08:25 +0100)]
Increase expiry for Active Storage URLs

3 months agoAllow BMP images to be transformed
Tom Hughes [Mon, 15 Jul 2019 23:24:37 +0000 (00:24 +0100)]
Allow BMP images to be transformed

https://github.com/rails/rails/issues/35953
https://github.com/rails/rails/pull/36051

3 months agoRun any Active Storage jobs in the storage queue
Tom Hughes [Mon, 15 Jul 2019 21:12:29 +0000 (22:12 +0100)]
Run any Active Storage jobs in the storage queue

3 months agoSend trace import result notification immediately
Tom Hughes [Mon, 15 Jul 2019 20:45:07 +0000 (21:45 +0100)]
Send trace import result notification immediately

If we delay sending failure notifications then they will fail
because the trace will no longer exist.

As trace imports are running in the background anyway there
doesn't seem to be any good reason to defer the emails.

Fixes #2312

3 months agoFix rubocop warning
Tom Hughes [Mon, 15 Jul 2019 20:18:13 +0000 (21:18 +0100)]
Fix rubocop warning

3 months agoStop creating a shared global querystring variable
Tom Hughes [Mon, 15 Jul 2019 19:27:42 +0000 (20:27 +0100)]
Stop creating a shared global querystring variable

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jul 2019 18:39:25 +0000 (20:39 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoSkip uploading images for users that have a new style avatar
Tom Hughes [Mon, 15 Jul 2019 18:17:01 +0000 (19:17 +0100)]
Skip uploading images for users that have a new style avatar

3 months agoAdd a rake task to move user avatars to Active Storage
Tom Hughes [Mon, 15 Jul 2019 16:29:39 +0000 (17:29 +0100)]
Add a rake task to move user avatars to Active Storage

3 months agoUpdate querystring references
Tom Hughes [Mon, 15 Jul 2019 09:03:09 +0000 (10:03 +0100)]
Update querystring references

3 months agoRevert accidental schema changes
Tom Hughes [Mon, 15 Jul 2019 08:27:52 +0000 (09:27 +0100)]
Revert accidental schema changes

3 months agoIt's to_sym not to_symbol
Tom Hughes [Mon, 15 Jul 2019 07:39:20 +0000 (08:39 +0100)]
It's to_sym not to_symbol

3 months agoMerge remote-tracking branch 'upstream/pull/2296'
Tom Hughes [Mon, 15 Jul 2019 07:19:30 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2296'

3 months agoEnable a few more eslint checks
Tom Hughes [Sun, 14 Jul 2019 11:08:02 +0000 (12:08 +0100)]
Enable a few more eslint checks

3 months agoEnforce consistent indentation in javascript code
Tom Hughes [Sun, 14 Jul 2019 09:52:18 +0000 (10:52 +0100)]
Enforce consistent indentation in javascript code

3 months agoFix eslint warning
Tom Hughes [Sat, 13 Jul 2019 16:46:23 +0000 (17:46 +0100)]
Fix eslint warning

3 months agoUpdate eslint
Tom Hughes [Sat, 13 Jul 2019 16:39:03 +0000 (17:39 +0100)]
Update eslint

Closes #2307

3 months agoMerge remote-tracking branch 'upstream/pull/2305'
Tom Hughes [Thu, 11 Jul 2019 19:23:31 +0000 (20:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2305'

3 months agomake link in documentation clickable
Mateusz Konieczny [Thu, 11 Jul 2019 19:09:43 +0000 (21:09 +0200)]
make link in documentation clickable

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jul 2019 15:39:18 +0000 (17:39 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoIgnore the class length of test files
Andy Allan [Wed, 10 Jul 2019 15:24:32 +0000 (17:24 +0200)]
Ignore the class length of test files

There's no sensible way to refactor a controller test into multiple classes,
so lets exclude them from the class length metrics to reveal other over-length
classes.

3 months agoAllow configuration of storage server URL for security policy
Tom Hughes [Sun, 7 Jul 2019 15:14:00 +0000 (16:14 +0100)]
Allow configuration of storage server URL for security policy

3 months agoMonkey patch Active Storage to set content type when uploading to S3
Tom Hughes [Fri, 5 Jul 2019 13:31:04 +0000 (14:31 +0100)]
Monkey patch Active Storage to set content type when uploading to S3

3 months agoAdd support for using S3 as the object store
Tom Hughes [Wed, 3 Jul 2019 20:48:25 +0000 (21:48 +0100)]
Add support for using S3 as the object store

3 months agoMove user images to Active Storage with paperclip as a fallback
Tom Hughes [Tue, 2 Jul 2019 21:31:31 +0000 (22:31 +0100)]
Move user images to Active Storage with paperclip as a fallback

3 months agoAdd support for Active Storage attachments
Tom Hughes [Tue, 2 Jul 2019 19:47:42 +0000 (20:47 +0100)]
Add support for Active Storage attachments

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Jul 2019 18:23:32 +0000 (20:23 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoUpdate wiki page data
Tom Hughes [Mon, 8 Jul 2019 10:08:12 +0000 (11:08 +0100)]
Update wiki page data

3 months agoFix rubocop warnings
Tom Hughes [Sun, 7 Jul 2019 15:30:04 +0000 (16:30 +0100)]
Fix rubocop warnings

3 months agoUpdate bundle
Tom Hughes [Sun, 7 Jul 2019 15:24:57 +0000 (16:24 +0100)]
Update bundle

3 months agoMerge remote-tracking branch 'upstream/pull/2223'
Tom Hughes [Sun, 7 Jul 2019 15:14:32 +0000 (16:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2223'

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 5 Jul 2019 05:26:34 +0000 (07:26 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoUbuntu 18.04 is now required. Add apt-get update
Grant Slater [Wed, 3 Jul 2019 19:47:07 +0000 (20:47 +0100)]
Ubuntu 18.04 is now required. Add apt-get update

3 months agoInclude bundler in packages to install on Ubuntu
Tom Hughes [Wed, 3 Jul 2019 16:59:14 +0000 (17:59 +0100)]
Include bundler in packages to install on Ubuntu

3 months agoMore tweaks for RTL email
Tom Hughes [Wed, 3 Jul 2019 13:19:45 +0000 (14:19 +0100)]
More tweaks for RTL email

Fixes #2297

3 months agoFix styling of email notifications in RTL languages
Tom Hughes [Wed, 3 Jul 2019 08:49:46 +0000 (09:49 +0100)]
Fix styling of email notifications in RTL languages

Fixes #2297

3 months agoAdd missing space
Tom Hughes [Wed, 3 Jul 2019 07:28:22 +0000 (08:28 +0100)]
Add missing space

3 months agoRevert "Block indexing of diary entries"
Tom Hughes [Tue, 2 Jul 2019 18:42:51 +0000 (19:42 +0100)]
Revert "Block indexing of diary entries"

This reverts commit fc67e63589536b0d8fa3a92aa7eff57ebeceb3a6.

3 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jul 2019 07:43:51 +0000 (09:43 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoMerge remote-tracking branch 'upstream/pull/2294'
Tom Hughes [Sun, 30 Jun 2019 14:27:25 +0000 (15:27 +0100)]
Merge remote-tracking branch 'upstream/pull/2294'

3 months agoUpdate to iD v2.15.3
Bryan Housel [Sun, 30 Jun 2019 14:15:38 +0000 (10:15 -0400)]
Update to iD v2.15.3

3 months agoMerge remote-tracking branch 'upstream/pull/2293'
Tom Hughes [Sun, 30 Jun 2019 10:57:56 +0000 (11:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2293'

3 months agoFix spellings from aggree to agree
Abijeet Patro [Sun, 30 Jun 2019 10:44:38 +0000 (16:14 +0530)]
Fix spellings from aggree to agree

As reported on https://translatewiki.net/wiki/Thread:Support/Found_typo_in_https://translatewiki.net/w/i.php%3Ftitle%3DOsm:Users.terms.tou_explain_html/en

3 months agoUpdate list of dependencies to install
Tom Hughes [Sat, 29 Jun 2019 23:25:21 +0000 (00:25 +0100)]
Update list of dependencies to install

3 months agoRubocop
mmd-osm [Fri, 28 Jun 2019 20:05:38 +0000 (22:05 +0200)]
Rubocop

3 months agoReplace respond_to with render xml format
mmd-osm [Fri, 28 Jun 2019 19:56:42 +0000 (21:56 +0200)]
Replace respond_to with render xml format

3 months agoRevert XML default for routes
mmd-osm [Fri, 28 Jun 2019 19:35:02 +0000 (21:35 +0200)]
Revert XML default for routes

3 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

3 months agoMerge branch 'master' into patch/view_migration
mmd [Thu, 27 Jun 2019 20:40:51 +0000 (22:40 +0200)]
Merge branch 'master' into patch/view_migration

3 months agoRefactoring
mmd-osm [Thu, 27 Jun 2019 20:23:38 +0000 (22:23 +0200)]
Refactoring

3 months agoRemove non functioning changeset_cache, user_display_name_cache
mmd-osm [Thu, 27 Jun 2019 19:26:11 +0000 (21:26 +0200)]
Remove non functioning changeset_cache, user_display_name_cache

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Jun 2019 16:37:17 +0000 (18:37 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoAvoid unnecessary arrays
mmd-osm [Thu, 27 Jun 2019 16:33:12 +0000 (18:33 +0200)]
Avoid unnecessary arrays

3 months agoSimplify partial rendering
mmd-osm [Wed, 26 Jun 2019 20:29:18 +0000 (22:29 +0200)]
Simplify partial rendering

3 months agoAvoid using @variables in partials
mmd-osm [Wed, 26 Jun 2019 19:34:40 +0000 (21:34 +0200)]
Avoid using @variables in partials

3 months agoMerge remote-tracking branch 'upstream/pull/2280'
Tom Hughes [Wed, 26 Jun 2019 18:57:12 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2280'

3 months agoMerge remote-tracking branch 'upstream/pull/2282'
Tom Hughes [Wed, 26 Jun 2019 18:23:18 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2282'

3 months agoMerge remote-tracking branch 'upstream/pull/2281'
Tom Hughes [Wed, 26 Jun 2019 18:19:58 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2281'

3 months agoSplit some extremely long strings over multiple lines using squiggly heredocs
Andy Allan [Wed, 26 Jun 2019 16:24:57 +0000 (18:24 +0200)]
Split some extremely long strings over multiple lines using squiggly heredocs

I'm not entirely convinced that testing walls of text like this is useful
anyway, but at least this approach makes the lines significantly less long.

3 months agoRename @edits variable to @changesets, for clarity
Andy Allan [Wed, 26 Jun 2019 15:07:49 +0000 (17:07 +0200)]
Rename @edits variable to @changesets, for clarity

3 months agoAdd support for an unversioned 'versions' API call
Andy Allan [Wed, 26 Jun 2019 14:38:20 +0000 (16:38 +0200)]
Add support for an unversioned 'versions' API call

This will eventually replace the unversioned 'capabilities' call.
Client applications can use this versions call to find out what versions
are available, if they support multiple versions. The capabilities
of each version, and the format of the capabilities call, is then
able to change between versions. If a client only supports one version
they can jump straight to the versioned capabilities call.

Additionally, supported versions are now a list of version identifiers,
without any implications surrounding min/max values (e.g. guesswork
for supported intermediate versions).

Fixes #2162

3 months agoMerge remote-tracking branch 'upstream/pull/2207'
Tom Hughes [Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2207'

3 months agoMerge remote-tracking branch 'upstream/pull/2279'
Tom Hughes [Wed, 26 Jun 2019 13:07:29 +0000 (14:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2279'

3 months agoAvoid stating the action to render when it just matches the current action
Andy Allan [Wed, 26 Jun 2019 12:50:35 +0000 (14:50 +0200)]
Avoid stating the action to render when it just matches the current action

3 months agoMerge remote-tracking branch 'upstream/pull/2278'
Tom Hughes [Wed, 26 Jun 2019 12:36:44 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/pull/2278'

3 months agoSimplify render calls for changesets
Andy Allan [Wed, 26 Jun 2019 12:25:34 +0000 (14:25 +0200)]
Simplify render calls for changesets

3 months agoSimplify partial rendering when the partial is named after the model
Andy Allan [Wed, 26 Jun 2019 12:13:09 +0000 (14:13 +0200)]
Simplify partial rendering when the partial is named after the model

3 months agoRework to ensure views are named after the controller method name
Andy Allan [Wed, 26 Jun 2019 10:52:21 +0000 (12:52 +0200)]
Rework to ensure views are named after the controller method name

3 months agoMerge remote-tracking branch 'upstream/pull/2271'
Tom Hughes [Wed, 26 Jun 2019 10:22:19 +0000 (11:22 +0100)]
Merge remote-tracking branch 'upstream/pull/2271'

3 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

3 months agoUpdate bundle
Tom Hughes [Tue, 25 Jun 2019 07:16:28 +0000 (08:16 +0100)]
Update bundle

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Jun 2019 15:02:58 +0000 (17:02 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoAllow signups to be blocked by MX host
Tom Hughes [Sun, 23 Jun 2019 10:21:03 +0000 (11:21 +0100)]
Allow signups to be blocked by MX host

3 months agoBlock indexing of diary entries
Tom Hughes [Sat, 22 Jun 2019 23:22:46 +0000 (00:22 +0100)]
Block indexing of diary entries

3 months agoUpdate Potlatch 2 to 2.5-83-g28c84372 build
Tom Hughes [Fri, 21 Jun 2019 10:23:38 +0000 (11:23 +0100)]
Update Potlatch 2 to 2.5-83-g28c84372 build

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Jun 2019 19:47:58 +0000 (21:47 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoMerge remote-tracking branch 'upstream/pull/2267'
Tom Hughes [Thu, 20 Jun 2019 18:02:31 +0000 (19:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2267'

3 months agoMerge remote-tracking branch 'upstream/pull/2270'
Tom Hughes [Thu, 20 Jun 2019 17:58:38 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/2270'

3 months agoMerge remote-tracking branch 'upstream/pull/2269'
Tom Hughes [Thu, 20 Jun 2019 17:54:44 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2269'

3 months agoUpdate note comments to use friendly_date_ago helper
Andy Allan [Wed, 19 Jun 2019 10:16:04 +0000 (12:16 +0200)]
Update note comments to use friendly_date_ago helper

Refs #2255

3 months agoUse friendly_date_ago for notes display
Andy Allan [Wed, 19 Jun 2019 10:11:47 +0000 (12:11 +0200)]
Use friendly_date_ago for notes display

Refs #2255

3 months agoUse friendly_date_ago for user blocks
Andy Allan [Wed, 19 Jun 2019 10:09:46 +0000 (12:09 +0200)]
Use friendly_date_ago for user blocks

Refs #2255

3 months agoUse friendly_date_ago helper for changeset comments
Andy Allan [Wed, 19 Jun 2019 10:06:13 +0000 (12:06 +0200)]
Use friendly_date_ago helper for changeset comments

Refs #2255