]> git.openstreetmap.org Git - rails.git/log
rails.git
7 years agoMake the publisher URL configurable, with no default
Tom Hughes [Wed, 22 Mar 2017 18:42:58 +0000 (18:42 +0000)]
Make the publisher URL configurable, with no default

7 years agoAdd server_protocol configuration option
Tom Hughes [Wed, 22 Mar 2017 18:22:24 +0000 (18:22 +0000)]
Add server_protocol configuration option

7 years agoUse node and old_node factories for redaction model tests.
Andy Allan [Wed, 22 Mar 2017 18:19:16 +0000 (18:19 +0000)]
Use node and old_node factories for redaction model tests.

7 years agoUse canonical-rails gem to generate canonical URLs
Tom Hughes [Wed, 22 Mar 2017 18:16:53 +0000 (18:16 +0000)]
Use canonical-rails gem to generate canonical URLs

7 years agoCreate a node factory, and use it for most node model tests
Andy Allan [Wed, 22 Mar 2017 17:50:10 +0000 (17:50 +0000)]
Create a node factory, and use it for most node model tests

7 years agoSet server_url in the test environment
Tom Hughes [Wed, 22 Mar 2017 17:24:28 +0000 (17:24 +0000)]
Set server_url in the test environment

7 years agoComment out server_url in the default configuration
Tom Hughes [Wed, 22 Mar 2017 17:19:08 +0000 (17:19 +0000)]
Comment out server_url in the default configuration

7 years agoAdd a canonical URL to the head
Tom Hughes [Wed, 22 Mar 2017 17:14:55 +0000 (17:14 +0000)]
Add a canonical URL to the head

7 years agoUse old_node factory for OldNode model tests.
Andy Allan [Wed, 22 Mar 2017 17:10:48 +0000 (17:10 +0000)]
Use old_node factory for OldNode model tests.

The valid/invalid tests were simplified, since there is little to be
gained from inserting (invalid) nodes into the database and comparing
the node with another copy of itself.

7 years agoRework the changeset helper tests to use factories.
Andy Allan [Wed, 22 Mar 2017 11:42:29 +0000 (11:42 +0000)]
Rework the changeset helper tests to use factories.

7 years agoUse changeset factory for factory associations
Andy Allan [Wed, 22 Mar 2017 11:09:52 +0000 (11:09 +0000)]
Use changeset factory for factory associations

One test needed updating since it assumed the comments were being
created on a particular changeset.

7 years agoCreate a changeset factory, and use it for model tests.
Andy Allan [Wed, 22 Mar 2017 10:47:24 +0000 (10:47 +0000)]
Create a changeset factory, and use it for model tests.

7 years agoRemove the api_fixtures call from changeset model tests, since they do not need the...
Andy Allan [Wed, 22 Mar 2017 10:40:13 +0000 (10:40 +0000)]
Remove the api_fixtures call from changeset model tests, since they do not need the fixtures.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 20 Mar 2017 06:38:24 +0000 (07:38 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1492'
Tom Hughes [Thu, 16 Mar 2017 19:02:35 +0000 (19:02 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1492'

7 years agoRemove the link between the redaction owner and the user doing the redaction in tests.
Andy Allan [Thu, 16 Mar 2017 10:21:25 +0000 (10:21 +0000)]
Remove the link between the redaction owner and the user doing the redaction in tests.

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 16 Mar 2017 07:18:33 +0000 (08:18 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoUse redactions factory for old_way controller tests
Andy Allan [Wed, 15 Mar 2017 18:04:58 +0000 (18:04 +0000)]
Use redactions factory for old_way controller tests

7 years agoAdjust rubocop threshold
Tom Hughes [Wed, 15 Mar 2017 17:57:46 +0000 (17:57 +0000)]
Adjust rubocop threshold

7 years agoUse redactions factory for old_node controller tests.
Andy Allan [Wed, 15 Mar 2017 17:50:57 +0000 (17:50 +0000)]
Use redactions factory for old_node controller tests.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1491'
Tom Hughes [Wed, 15 Mar 2017 17:37:13 +0000 (17:37 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1491'

7 years agoUse redaction factory for old_relation controller tests.
Andy Allan [Wed, 15 Mar 2017 17:13:47 +0000 (17:13 +0000)]
Use redaction factory for old_relation controller tests.

7 years agoFix typos in assertion messages.
Andy Allan [Wed, 15 Mar 2017 17:06:29 +0000 (17:06 +0000)]
Fix typos in assertion messages.

7 years agoUse redactions factory in redaction controller test.
Andy Allan [Wed, 15 Mar 2017 17:01:41 +0000 (17:01 +0000)]
Use redactions factory in redaction controller test.

7 years agoCreate a redactions factory and use for model tests.
Andy Allan [Wed, 15 Mar 2017 16:24:39 +0000 (16:24 +0000)]
Create a redactions factory and use for model tests.

7 years agoRefactor the oauth integration test to avoid using user fixtures.
Andy Allan [Wed, 15 Mar 2017 16:13:04 +0000 (16:13 +0000)]
Refactor the oauth integration test to avoid using user fixtures.

7 years agoUse user factory for user_terms_seen integration test.
Andy Allan [Wed, 15 Mar 2017 15:53:47 +0000 (15:53 +0000)]
Use user factory for user_terms_seen integration test.

7 years agoUse user factories for some changeset_controller tests.
Andy Allan [Wed, 15 Mar 2017 15:41:42 +0000 (15:41 +0000)]
Use user factories for some changeset_controller tests.

Others are tightly interwoven with the fixtures and will be tackled seperately.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1488'
Tom Hughes [Wed, 15 Mar 2017 14:22:59 +0000 (14:22 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1488'

7 years agoUse a pending user for testing password resets.
Andy Allan [Wed, 15 Mar 2017 14:22:04 +0000 (14:22 +0000)]
Use a pending user for testing password resets.

7 years agoUse users factory for user_controller tests.
Andy Allan [Wed, 15 Mar 2017 11:56:36 +0000 (11:56 +0000)]
Use users factory for user_controller tests.

7 years agoThrow an exception if adding a note comment fails
Tom Hughes [Mon, 13 Mar 2017 14:49:16 +0000 (14:49 +0000)]
Throw an exception if adding a note comment fails

7 years agoMake search use HTTPS automatically
Christian Stadelmann [Sun, 22 Mar 2015 19:26:33 +0000 (20:26 +0100)]
Make search use HTTPS automatically

Currently users end up having a HTTP search function even if they
install it to their browsers from the HTTPS site. This is a unexpected
reduction in privacy.

Since search requests are private data they should be sent via HTTPS.

Closes #936

7 years agoBuild pending users via factory
Andy Allan [Mon, 13 Mar 2017 10:20:06 +0000 (10:20 +0000)]
Build pending users via factory

7 years agoReturn maximum size of bounding box for note retrieval
Simon Poole [Mon, 13 Mar 2017 07:47:01 +0000 (08:47 +0100)]
Return maximum size of bounding box for note retrieval

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 13 Mar 2017 07:21:19 +0000 (08:21 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoImprove styling of flash messages on the front page
Tom Hughes [Fri, 10 Mar 2017 16:46:29 +0000 (16:46 +0000)]
Improve styling of flash messages on the front page

7 years agoShow offline/readonly messages as normal flash messages
Tom Hughes [Fri, 10 Mar 2017 16:30:04 +0000 (16:30 +0000)]
Show offline/readonly messages as normal flash messages

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1484'
Tom Hughes [Fri, 10 Mar 2017 15:58:57 +0000 (15:58 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1484'

7 years agoAdd some whitespace
Tom Hughes [Fri, 10 Mar 2017 15:34:34 +0000 (15:34 +0000)]
Add some whitespace

7 years agoUse user factories for user_login integration tests.
Andy Allan [Fri, 10 Mar 2017 14:44:22 +0000 (14:44 +0000)]
Use user factories for user_login integration tests.

The display_name logins were reworked to use downcase since the
factories supply users with an already-title-cased display_name.

The tests were also renamed to align better with the purpose of the
test rather than the name of the fixture used.

7 years agoUse user factories for page_locale integration tests.
Andy Allan [Fri, 10 Mar 2017 14:53:19 +0000 (14:53 +0000)]
Use user factories for page_locale integration tests.

7 years agoUse user factories for user_block integration tests.
Andy Allan [Fri, 10 Mar 2017 14:48:29 +0000 (14:48 +0000)]
Use user factories for user_block integration tests.

7 years agoUse user factories for user_roles integration tests.
Andy Allan [Fri, 10 Mar 2017 11:02:40 +0000 (11:02 +0000)]
Use user factories for user_roles integration tests.

7 years agoUse user factory for user_creation test.
Andy Allan [Fri, 10 Mar 2017 10:57:46 +0000 (10:57 +0000)]
Use user factory for user_creation test.

7 years agoUse user factory for application_helper tests.
Andy Allan [Fri, 10 Mar 2017 10:53:00 +0000 (10:53 +0000)]
Use user factory for application_helper tests.

7 years agoUse user factory for note_helper tests.
Andy Allan [Fri, 10 Mar 2017 10:33:28 +0000 (10:33 +0000)]
Use user factory for note_helper tests.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1483'
Tom Hughes [Thu, 9 Mar 2017 18:35:57 +0000 (18:35 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1483'

7 years agoImprove trace#api_data tests
Tom Hughes [Thu, 9 Mar 2017 18:28:46 +0000 (18:28 +0000)]
Improve trace#api_data tests

The api_data action doesn't actually take the username as an
arguement and should be modelled on api_read rather than the
actions that handle web views.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1481'
Tom Hughes [Thu, 9 Mar 2017 18:14:34 +0000 (18:14 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1481'

7 years agoRemove redundant tests for deleted traces, and rearrange comments and factory calls...
Andy Allan [Thu, 9 Mar 2017 17:21:46 +0000 (17:21 +0000)]
Remove redundant tests for deleted traces, and rearrange comments and factory calls for consistency.

7 years agoUse user factory for user_roles_helper test
Andy Allan [Thu, 9 Mar 2017 16:59:44 +0000 (16:59 +0000)]
Use user factory for user_roles_helper test

7 years agoCreate a super_user factory.
Andy Allan [Thu, 9 Mar 2017 16:21:51 +0000 (16:21 +0000)]
Create a super_user factory.

7 years agoCreate a fresh user when requesting non-existent traces.
Andy Allan [Thu, 9 Mar 2017 14:50:02 +0000 (14:50 +0000)]
Create a fresh user when requesting non-existent traces.

7 years agoUse user factory for message model tests.
Andy Allan [Thu, 9 Mar 2017 11:52:31 +0000 (11:52 +0000)]
Use user factory for message model tests.

7 years agoTake the user from the node or changeset, rather than referring to the fixture.
Andy Allan [Thu, 9 Mar 2017 11:29:43 +0000 (11:29 +0000)]
Take the user from the node or changeset, rather than referring to the fixture.

7 years agoUse user factory for note model test.
Andy Allan [Thu, 9 Mar 2017 11:06:07 +0000 (11:06 +0000)]
Use user factory for note model test.

7 years agoUse user factory for oauth_token model test.
Andy Allan [Thu, 9 Mar 2017 11:04:29 +0000 (11:04 +0000)]
Use user factory for oauth_token model test.

7 years agoUse user factory for user_preference model tests.
Andy Allan [Thu, 9 Mar 2017 10:57:57 +0000 (10:57 +0000)]
Use user factory for user_preference model tests.

7 years agoUse user factory for trace model tests.
Andy Allan [Thu, 9 Mar 2017 10:53:11 +0000 (10:53 +0000)]
Use user factory for trace model tests.

7 years agoUse user factory for trace_controller tests
Andy Allan [Thu, 9 Mar 2017 10:13:18 +0000 (10:13 +0000)]
Use user factory for trace_controller tests

7 years agoRemove fake qqq locale
Tom Hughes [Thu, 9 Mar 2017 07:10:10 +0000 (07:10 +0000)]
Remove fake qqq locale

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 9 Mar 2017 07:01:16 +0000 (08:01 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoDo more preloading in browse controller methods
Tom Hughes [Tue, 7 Mar 2017 09:10:24 +0000 (09:10 +0000)]
Do more preloading in browse controller methods

Fixes #1476

7 years agoFix accidental change in comments
Tom Hughes [Mon, 6 Mar 2017 18:01:26 +0000 (18:01 +0000)]
Fix accidental change in comments

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1477'
Tom Hughes [Mon, 6 Mar 2017 17:54:26 +0000 (17:54 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1477'

7 years agoDetect a timeout encapsulated in ActionView::Template::Error
Tom Hughes [Mon, 6 Mar 2017 17:50:09 +0000 (17:50 +0000)]
Detect a timeout encapsulated in ActionView::Template::Error

Fixes #1476

7 years agoUse user factory for swf_controller tests.
Andy Allan [Mon, 6 Mar 2017 17:28:06 +0000 (17:28 +0000)]
Use user factory for swf_controller tests.

7 years agoUse user factory for message_controller tests.
Andy Allan [Mon, 6 Mar 2017 17:25:55 +0000 (17:25 +0000)]
Use user factory for message_controller tests.

7 years agoUse user factory for user_roles_controller tests.
Andy Allan [Mon, 6 Mar 2017 16:55:05 +0000 (16:55 +0000)]
Use user factory for user_roles_controller tests.

7 years agoFix hiding of sidebar loading indicator
Tom Hughes [Mon, 6 Mar 2017 12:22:14 +0000 (12:22 +0000)]
Fix hiding of sidebar loading indicator

Fixes #1475

7 years agoRemove fake qqq locale
Tom Hughes [Mon, 6 Mar 2017 09:00:16 +0000 (09:00 +0000)]
Remove fake qqq locale

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 6 Mar 2017 08:03:14 +0000 (09:03 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoRemove inline styles
Tom Hughes [Sun, 5 Mar 2017 19:51:01 +0000 (19:51 +0000)]
Remove inline styles

7 years agoUse users factory for user_preferences_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:47:40 +0000 (16:47 +0000)]
Use users factory for user_preferences_controller tests.

7 years agoUse users factory for user_blocks_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:59 +0000 (16:34 +0000)]
Use users factory for user_blocks_controller tests.

7 years agoUse users factory for redactions_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:36 +0000 (16:34 +0000)]
Use users factory for redactions_controller tests.

7 years agoUse local api to export map.osm
Han Chao [Sun, 5 Mar 2017 10:37:25 +0000 (10:37 +0000)]
Use local api to export map.osm

Closes #1282

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1437'
Tom Hughes [Sun, 5 Mar 2017 10:34:23 +0000 (10:34 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1437'

7 years agoUpdate HSTS to publish a max-age=0 to disable it
Tom Hughes [Fri, 3 Mar 2017 11:34:39 +0000 (11:34 +0000)]
Update HSTS to publish a max-age=0 to disable it

7 years agoSilence remaining jshint warnings
Tom Hughes [Thu, 2 Mar 2017 10:44:18 +0000 (10:44 +0000)]
Silence remaining jshint warnings

7 years agoDon't try and modify policy if we don't have one
Tom Hughes [Thu, 2 Mar 2017 10:39:18 +0000 (10:39 +0000)]
Don't try and modify policy if we don't have one

7 years agoUpdate Potlatch 2 to 2.4-46-gea38865 build
Tom Hughes [Thu, 2 Mar 2017 10:33:49 +0000 (10:33 +0000)]
Update Potlatch 2 to 2.4-46-gea38865 build

7 years agoFix some jshint warnings
Tom Hughes [Thu, 2 Mar 2017 10:20:51 +0000 (10:20 +0000)]
Fix some jshint warnings

7 years agoImprove the content security policy
Tom Hughes [Wed, 1 Mar 2017 22:38:24 +0000 (22:38 +0000)]
Improve the content security policy

7 years agoRemove inline javascript from page header
Tom Hughes [Wed, 1 Mar 2017 21:19:32 +0000 (21:19 +0000)]
Remove inline javascript from page header

7 years agoRemove inline javascript from id views
Tom Hughes [Wed, 1 Mar 2017 18:07:22 +0000 (18:07 +0000)]
Remove inline javascript from id views

7 years agoCorrect name of zoom argument for Potlatch 2
Tom Hughes [Wed, 1 Mar 2017 14:06:05 +0000 (14:06 +0000)]
Correct name of zoom argument for Potlatch 2

Fixes #1471

7 years agoRemove inline javascript from potlatch2 view
Tom Hughes [Tue, 28 Feb 2017 20:37:23 +0000 (20:37 +0000)]
Remove inline javascript from potlatch2 view

7 years agoRemove inline javascript from potlatch view
Tom Hughes [Tue, 28 Feb 2017 18:27:14 +0000 (18:27 +0000)]
Remove inline javascript from potlatch view

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1469'
Tom Hughes [Tue, 28 Feb 2017 00:21:23 +0000 (00:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1469'

7 years agoRemove inline javascript from user views
Tom Hughes [Mon, 27 Feb 2017 22:48:36 +0000 (22:48 +0000)]
Remove inline javascript from user views

7 years agoAdded new I18N string: notifier.friend_notification.hi
Herve Saint-Amand [Mon, 27 Feb 2017 22:37:52 +0000 (22:37 +0000)]
Added new I18N string: notifier.friend_notification.hi

7 years agoIncluded greeting string in changeset_comment_notification email
Herve Saint-Amand [Mon, 27 Feb 2017 22:36:09 +0000 (22:36 +0000)]
Included greeting string in changeset_comment_notification email

7 years agoRevert "Update iD frame parameters if the parent URL changes"
Tom Hughes [Mon, 27 Feb 2017 14:31:56 +0000 (14:31 +0000)]
Revert "Update iD frame parameters if the parent URL changes"

This reverts commit a6fa8cc273017c2673d6d76dae7f5ac811c2027d.

7 years agoUpdate iD frame parameters if the parent URL changes
Tom Hughes [Mon, 27 Feb 2017 13:23:27 +0000 (13:23 +0000)]
Update iD frame parameters if the parent URL changes

Fixes #1468

7 years agoRemove fake qqq locale
Tom Hughes [Mon, 27 Feb 2017 13:00:43 +0000 (13:00 +0000)]
Remove fake qqq locale

7 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 27 Feb 2017 07:02:07 +0000 (08:02 +0100)]
Localisation updates from https://translatewiki.net.

7 years agoMerge remote-tracking branch 'openstreetmap/pull/1467'
Tom Hughes [Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1467'

7 years agoExternalize message about missing OAuth capabilities/permissions and make it less...
Simon Poole [Sun, 26 Feb 2017 20:43:43 +0000 (21:43 +0100)]
Externalize message about missing OAuth capabilities/permissions and make it less technical