Commit graph

343 commits

Author SHA1 Message Date
Andy Allan
3115fd41b1 Remove minitest-rails-capybara and convert feature tests to system tests 2017-11-29 12:33:03 +00:00
Andy Allan
effb1b7f41 Merge branch 'master' into moderation 2017-11-29 12:18:39 +00:00
Tom Hughes
9e929de530 Add framework for system tests 2017-11-15 19:14:31 +00:00
Tom Hughes
b2fa947502 Replace factory_girl with factory_bot 2017-10-29 19:29:30 +00: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
d3a876f13a Update rails to 5.0.6 2017-09-08 15:27:14 +01:00
Andy Allan
47d8d79c99 Add minitest-rails-capybara
This allows us to write feature tests using capybara. These can be
easily changed to system tests when we upgrade to rails 5.1
2017-09-06 11:21:00 +01:00
Tom Hughes
9ed1fe2d78 Fix rubocop warning 2017-08-03 19:08:54 +01:00
Tom Hughes
c7377c7f9f Switch to using openstreetmap-deadlock_retry
Closes #1602
2017-08-03 18:41:45 +01:00
Andy Allan
60f2074bac Merge pull request #1588 from Georeactor/master
Update gem, fix icons on RTL/Arabic pages
2017-08-02 15:15:25 +01:00
Andy Allan
e31376e28d Merge branch 'master' into moderation 2017-08-02 12:12:57 +01:00
Tom Hughes
72fb2062b5 Update to rails 5.0.5 2017-07-31 21:55:40 +01:00
Nick Doiron
de3e02d41a use no-r2 comment to block RTL gem from changing sprites 2017-07-26 09:15:07 -10:00
Andy Allan
dbd88d893f Merge branch 'master' into moderation 2017-07-12 10:16:11 +01:00
Tom Hughes
28bfaa9fb6 Replace timecop with the rails builtin travel_to method 2017-07-10 21:19:22 +01:00
Tom Hughes
81deb35331 Update to rails 5.0.4 2017-06-27 08:26:44 +01:00
Tom Hughes
895b4e72ab Update to rails 4.2.9 2017-06-27 08:18:16 +01:00
Tom Hughes
95eda2d381 Update bundle 2017-06-02 00:08:30 +01:00
Tom Hughes
24271b75bd Use canonical-rails gem to generate canonical URLs 2017-03-22 18:16:53 +00:00
Tom Hughes
40a8e5caf5 Add support for Content-Security-Policy
Currently this is report only, and disabled unless a report URL has
been set in the application configuration.
2017-02-26 19:48:13 +00:00
Tom Hughes
f8f7cc4628 Update to rails 4.2.8 2017-02-23 21:18:57 +00:00
Tom Hughes
f435fce007 Link GPX fixture files instead of stubbing 2017-02-05 17:26:31 +00:00
Tom Hughes
0814b4096c Merge remote-tracking branch 'openstreetmap/pull/1347' into master 2017-02-05 16:02:20 +00:00
Tom Hughes
c8671c137a Update rubocop 2017-02-05 11:12:37 +00:00
Tom Hughes
17135cad03 Add support for generating TOTP cookies
This allows other sites in the openstreetmap.org domain to validate
that requests are coming from a www.openstreetmap.org user.
2017-01-02 19:01:01 +00:00
Tom Hughes
69b967c9ff Add support for Wikimedia authentication
Closes #1146
2016-12-20 22:32:25 +00:00
Tom Hughes
7f363a6ce7 Use image_optim_rails instead of image_optim
The rails hooks have been extracted into a separate gem so
this hasn't actually been working since the last image_optim
update happened.
2016-11-10 12:14:19 +00:00
Andy Allan
6bc488a983 Add webmock to intercept real http connections during tests
Intercepting real http connections also allows running the test
suite without an internet connection.
2016-10-30 10:28:26 +01:00
Andy Allan
a32333ba12 Use stub_any_instance in order to stub find results.
This is a much cleaner approach than before.
2016-10-30 10:22:10 +01:00
Tom Hughes
9d106676b8 Replace quova with support for local Maxmind GeoIP lookups 2016-10-20 21:40:03 +01:00
Tom Hughes
fd9bf6b0ab Update to rails 4.2.7.1 2016-09-15 22:26:48 +01:00
Andy Allan
d5013ad0d2 Add FactoryGirl 2016-09-07 15:28:28 +01:00
Shrey
5add3cf671 Basic models set up 2016-08-22 16:12:31 +01:00
Tom Hughes
c70a1fe933 Add support for GitHub authentication 2016-07-14 09:40:45 +01:00
Tom Hughes
5fd4fd13c2 Update to rails 4.2.7 2016-07-13 09:14:01 +01:00
Tom Hughes
fe04a0c486 Update to rails 4.2.6 2016-03-07 22:38:40 +00:00
Tom Hughes
95bf36e158 Update rails to 4.2.5.2 2016-02-29 22:23:08 +00:00
Tom Hughes
b2f2188e9d Remove sprockets-rails version restriction now konacha is fixed 2016-02-11 07:10:42 +00:00
Tom Hughes
e4acc41d28 Update to tails 4.2.5.1 2016-01-25 21:26:54 +00:00
Tom Hughes
e20bb507f1 Fix issues with bogus % encoded sequences in URLs
Add a URI sanitizer to the rack stack avoid rack throwing
exceptions on the server side, and ignore errors decoding
components on the client side.

Fixes #1101
2015-12-07 13:52:20 +00:00
Tom Hughes
c56bf5677a Switch back to the upsteam image_optim 2015-11-21 16:21:30 +00:00
Tom Hughes
7f3bb52b65 Update to rails 4.2.5 2015-11-19 21:41:33 +00:00
Tom Hughes
c96eb7d181 Update image_optim and disable cleanupIDs plugin 2015-11-19 21:29:23 +00:00
Tom Hughes
509f07b32e Switch back to the upstream omniauth-google-oauth2 gem
Out patch is included now, so there is no need to use our version.
2015-10-02 09:01:58 +01:00
Tom Hughes
36cbda3c80 Sprockets 3 seems to be OK now 2015-09-25 15:18:47 +01:00
Tom Hughes
284b56bee9 Use image_optim to optimize SVG assets with svgo 2015-09-13 10:48:33 +01:00
Tom Hughes
ee9ac1930d Update to rails 4.2.4 2015-08-24 22:32:00 +01:00