Commit graph

461 commits

Author SHA1 Message Date
Tom Hughes
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Tom Hughes
66ba93d6e6 Update Potlatch 2 to 2.5-21-gec1befed build 2018-01-17 12:32:58 +00:00
Tom Hughes
31133683b4 Don't add system tests if the user specified which tests to run 2017-12-09 10:52:19 +00:00
Tom Hughes
d581fbfaf1 Make system tests run by default 2017-11-15 19:14:31 +00:00
Tom Hughes
9e929de530 Add framework for system tests 2017-11-15 19:14:31 +00:00
Tom Hughes
b6b9d543ac Fix rubocop warnings 2017-10-29 19:43:02 +00:00
Tom Hughes
fff5a755d3 Convert session timeout to seconds when it is set
This avoids problems if the rails Duration class changes
representation between different versions of rails.
2017-10-25 08:59:29 +01:00
Tom Hughes
38640e0253 Merge remote-tracking branch 'upstream/pull/1652' 2017-10-25 08:16:33 +01:00
Andy Allan
4d406fcdfd Rubocop fixes 2017-10-22 22:35:34 +01:00
Andy Allan
b2a8df0bd7 Add annotate gem and associated rake task. Annotate models. 2017-10-22 22:18:26 +01:00
Tom Hughes
f773f67958 Update to rails 5.1.4 2017-10-17 18:49:55 +01:00
Tom Hughes
8dae890a76 Fix rubocop warnings 2017-10-05 19:18:38 +01:00
Tom Hughes
81deb35331 Update to rails 5.0.4 2017-06-27 08:26:44 +01:00
Andy Allan
396f2e28dd Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509 2017-06-23 14:03:57 +01:00
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
38a39352cb Replace deprecated xxx_filter methods with xxx_action 2017-06-03 17:33:19 +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
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
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
12d3f94e3c Play a bit of whack-an-seo-mole 2017-05-18 15:02:21 +01:00
Tom Hughes
460a8a106b Update Potlatch 2 to 2.4-46-gea38865 build 2017-03-02 10:33:49 +00:00
Tom Hughes
c8671c137a Update rubocop 2017-02-05 11:12:37 +00:00
Tom Hughes
c985c2d4ce Update Potlatch 2 to 2.4-32-gecf1e0b build 2017-01-19 15:03:56 +00:00
Han Chao
ade561d3e6 Fix clang build error
By default, Clang builds C code in GNU C11 mode, so it uses
standard C99 semantics for the inline keyword:

http://clang.llvm.org/compatibility.html#inline

Closes #1399
2016-12-30 07:38:28 +00:00
Tom Hughes
69b967c9ff Add support for Wikimedia authentication
Closes #1146
2016-12-20 22:32:25 +00:00
Tom Hughes
44e778aedd Increase password stretching to 10000 interations
This is in line with current reccomendations from various sources.
2016-11-25 08:54:57 +00:00
Tom Hughes
2f722fc281 Merge remote-tracking branch 'openstreetmap/pull/1350' 2016-11-09 20:32:54 +00:00
Tom Hughes
282ff4936c Fix rubocop warnings 2016-10-31 21:24:10 +00:00
Andy Allan
5e86393f72 Use webmock to power the with_http_stubs helper
This involves a small amount of changing the fixtures since we're
using the regexp and not the full url matching powers of webmock.
2016-10-30 10:29:16 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Tom Hughes
9d106676b8 Replace quova with support for local Maxmind GeoIP lookups 2016-10-20 21:40:03 +01:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Tom Hughes
d82f9d12ce Fix new rubocop warnings 2016-09-15 19:21:00 +01:00
Tom Hughes
c70a1fe933 Add support for GitHub authentication 2016-07-14 09:40:45 +01:00
Tom Hughes
72e71b9972 Fix rubocop warnings 2016-06-09 22:18:28 +01:00
Tom Hughes
4e95ff1707 Allow redcarpet to add nofollow to links
This, using a new feature in redcarpet, allows us to avoid having
to subclass the renderer and implement links ourselves, which in
turn means that redcarpet's link sanitisation works.
2016-03-24 08:36:32 +00:00
Tom Hughes
5d3ecffa28 Fix new rubocop warnings 2016-02-05 13:35:26 +00:00
Tom Hughes
8fe1899596 Fix rubocop warnings 2016-01-19 09:51:24 +00:00
Tom Hughes
213fa728ea Discard and locale tags that fail to parse 2016-01-07 09:10:19 +00:00
Tom Hughes
4028f4cdb9 Rework locale selection
Implement our own matching algorithm rather than trying to
patch the http_accept_language one and make sure everything is
using it in a consistent way.

Fixes #1125
2016-01-06 18:43:25 +00:00
Tom Hughes
081ac24295 Fix rubocop warnings 2015-11-19 21:41:33 +00:00
Tom Hughes
1dbc655235 Update Potlatch 2 to 2.4-12-g7158c69 build 2015-09-28 08:38:02 +01:00
Tom Hughes
c9d35839be Fix new rubocopy warnings 2015-08-18 20:57:14 +01:00
Tom Hughes
674aef0d3f Update Potlatch 2 to 2.4-4-g37a0924 build 2015-07-05 13:17:24 +01:00
Tom Hughes
957d75295b Fix warnings from rubocop update 2015-06-08 15:59:17 +01:00
Tom Hughes
2b2264ddab Add support for Windows Live authentication 2015-05-19 14:04:09 +01:00
Tom Hughes
c9893e186b Add support for Facebook authentication 2015-05-19 14:04:08 +01:00
Tom Hughes
eeb9866d50 Add support for Google OAuth2 authentication
This replaces OpenID authentication, which is going away soon, but
provides an upgrade path where we can migrate users that already have
a Google OpenID setup to the new system transparently.
2015-04-14 10:08:07 +01:00