Commit graph

7941 commits

Author SHA1 Message Date
Tom Hughes
ab3df6fc56 Refactor AMF encodevalue routine
Simplify the switch, and raise an exception if we see an unexpected
type rather than just logging and then accidentally triggering a odd
error by returning true when a string is expected.
2017-06-21 21:20:41 +01:00
Tom Hughes
d892a9be52 Update bundle 2017-06-20 19:03:14 +01:00
Tom Hughes
1fe3fc2dbe Disable removeUnknownsAndDefaults instead of removeUselessStrokeAndFill 2017-06-14 15:25:47 +01:00
Tom Hughes
ea9a4c2aa2 Convert XML document to a string when returning it
Otherwise the Rak::ETag module will throw an exception when it
tries to test if the response is empty.
2017-06-13 12:55:13 +01:00
Bryan Housel
13aae29476 Disable removeUselessStrokeAndFill svgo plugin
see https://github.com/openstreetmap/iD/issues/4105
2017-06-12 18:43:19 -04:00
Bryan Housel
71d19cebf3 No need to precompile traffico anymore, as it's been removed 2017-06-12 18:36:50 -04:00
Bryan Housel
727c1b0595 Update to iD v2.2.2 2017-06-12 11:24:59 -04:00
Bryan Housel
6837d7cdba Remove old traffico mapillary signs library from Vendorfile 2017-06-12 11:22:53 -04:00
Tom Hughes
3cb294bebd Update bundle 2017-06-11 19:32:51 +01:00
Tom Hughes
fb4ea1a02a Add explicit primary key declaration for changeset subscriptions
This table has a composite primary key and although we don't really
rely on that at all rails 5.0 warns about itif you don't explcitly
declare it in order to trigger the CPK extension.
2017-06-06 22:42:25 +01:00
Tom Hughes
07673278f1 Remove deprecated get_via_direct and post_via_redirect methods 2017-06-06 00:03:39 +01:00
Tom Hughes
18c8946556 Use explicit to_unsafe_h method when converting parameters to a hash 2017-06-05 22:44:15 +01:00
Tom Hughes
d85621c7ae Replace deprecated ActiveModel::Errors get/set methods 2017-06-05 22:41:23 +01:00
Tom Hughes
d4df87c1e1 Replace deprecated env method with request.env 2017-06-05 22:38:27 +01:00
Tom Hughes
4248e10946 Use distinct instead of uniq which is deprecated 2017-06-04 22:52:41 +01:00
Tom Hughes
9dafeda080 Replace render :nothing with non-deprecated alternatives 2017-06-04 22:52:41 +01:00
Tom Hughes
339d8e46ff Sanitise parameters used in URL generation 2017-06-04 20:24:53 +01:00
Tom Hughes
03a9df9288 Replace render :nothing with head 2017-06-04 20:24:53 +01:00
Tom Hughes
38a39352cb Replace deprecated xxx_filter methods with xxx_action 2017-06-03 17:33:19 +01:00
Tom Hughes
8412ed0bed Replace deprecated Mime::XXX with Mime[:xxx] 2017-06-03 17:33:13 +01:00
Tom Hughes
2357118c46 Avoid using format as a URL parameter name
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
2017-06-03 12:08:35 +01:00
Tom Hughes
3b2d1886eb Make delete button translatable 2017-06-03 12:04:00 +01:00
Tom Hughes
124ec2e9d5 Merge remote-tracking branch 'openstreetmap/pull/1553' 2017-06-02 20:34:17 +01:00
Hamel Desai
fa7b3022a8 Add delete button to message view
Fixes #1504
Closes #1557
2017-06-02 20:31:59 +01:00
Tom Hughes
80d27a7fae Sanitise parameters used in URL generation 2017-06-02 20:27:07 +01:00
Tom Hughes
4ef7b2c651 Remove duplicate size specification for user image
Either the size or the width and height can be passed but passing
both doesn't make any sense and in rails 5.0 will error.
2017-06-02 20:27:07 +01:00
Tom Hughes
ff97501ed0 Remove all use of the :text option to render
It doesn't actually do what it says, as it sets the content type
to text/html not text/plain so is just confusing and as a result
has been deprecated in newer rails versions.
2017-06-02 19:12:05 +01:00
Tom Hughes
9b89d4eefe Remove conditions from delete_all
Passing conditions directory to delete_all is deprecated
in rails 5.0 so use a separate where instead.
2017-06-02 16:33:48 +01:00
Tom Hughes
28d902a1bb Rescue LoadError instead of MissingSourceFile
MissingSourceFile is just an alias for LoadError in rails 4.2 and
in rails 5.0 it is no longer present.
2017-06-02 16:33:40 +01:00
Tom Hughes
b00b9ce626 Remove arguments from assert_nothing_raised
It has never done anything with the argument and rails 5.0 warns
that rails 5.1 will remove the argument.
2017-06-02 16:33:34 +01:00
Tom Hughes
f8f7054fc2 Move monkey patch modules to the OpenStreetMap namespace
Having them in the OSM namespace risks blocking autoloading
of the lib/osm.rb code by defining the OSM constant.
2017-06-02 16:33:27 +01:00
Tom Hughes
5b33f3f8e3 Fix rubocop warnings 2017-06-02 00:08:30 +01:00
Tom Hughes
95eda2d381 Update bundle 2017-06-02 00:08:30 +01:00
Tom Hughes
68a6fce1f9 Fix up monkey patching of ActiveRecord for migrations 2017-06-01 23:18:18 +01:00
Tom Hughes
f940a154f3 Replace alias_method_chain with Module#prepend 2017-06-01 22:45:28 +01:00
Tom Hughes
f412c80d3f Drop monkey patches that are no longer required 2017-06-01 22:42:02 +01:00
Tom Hughes
cdeb95092b Drop hack used for rails 4 upgrade 2017-06-01 22:41:55 +01:00
Andy Allan
060230fb94 Ensure closed changesets appear in the feed, and update some misleading comments. 2017-06-01 15:43:51 +01:00
Andy Allan
c12459dead Remove test fixtures. 2017-06-01 11:01:17 +01:00
Andy Allan
86822ea225 Remove remaining references to fixtures. 2017-06-01 11:00:50 +01:00
Andy Allan
5d0ea28796 Remove the api_fixtures helper
This is no longer required, as the tests no longer use fixtures.
2017-06-01 10:59:48 +01:00
Andy Allan
162949817d Rubocop fixes. 2017-06-01 10:58:34 +01:00
Andy Allan
3438c15c8f create nodes from factories for the api changes test. 2017-06-01 10:52:05 +01:00
Andy Allan
00546639df Update amf_controller tests to use a factory-generated user for credentials. 2017-05-31 18:51:08 +01:00
Andy Allan
5246ebefa9 Update the user list pagination test to avoid counting users from fixtures. 2017-05-31 18:43:28 +01:00
Andy Allan
cea6f9c4cf Refactor the user list test to use factory-built users and explicit assertions. 2017-05-31 18:40:20 +01:00
Andy Allan
0a1834af63 Use factories to generate the relations 2017-05-31 18:21:24 +01:00
Andy Allan
4922771aff Use the user factory to generate login details. 2017-05-31 18:15:24 +01:00
Andy Allan
4ee270df6f Refactor the assert_changeset helper to take an array of changesets, instead of ids. 2017-05-31 18:08:20 +01:00
Andy Allan
241c724adb Only use changesets from factories for the test_query changeset controller tests. 2017-05-31 18:02:56 +01:00