Commit graph

230 commits

Author SHA1 Message Date
Tom Hughes
98de681e47 Update to rails 5.2.0 2018-06-19 00:16:24 +01:00
Tom Hughes
aee222551a Update to rails 5.1.6 2018-06-18 09:14:50 +01:00
Tom Hughes
2f6a583510 Update bundle 2018-06-18 08:55:34 +01:00
Tom Hughes
7441f15b4f Merge remote-tracking branch 'upstream/pull/1576' 2018-06-16 11:45:23 +01:00
Benjamin Reynolds
d5672aed4a Remove quad_tile library and extract to gem
Quad tile functions are now installed via a gem with native extension
automatically. This improves the run time of the test suite by ~30% for
users that didn't bother to build the C version of the functions.

Closes #1314
Closes #1899
2018-06-14 18:29:37 +01:00
Tom Hughes
d3700e6201 Merge branch 'master' into next 2018-06-10 17:02:12 +01:00
Tom Hughes
17981cf472 Update bundle 2018-05-27 15:51:47 +01:00
Tom Hughes
6f4f4b4d71 Add missing dependencies 2018-05-19 11:15:56 +01:00
Tom Hughes
b126f02df9 Update bundle 2018-05-17 19:25:58 +01:00
Andy Allan
8d724600f3 Add better_errors gem for easier debugging 2018-04-11 14:07:38 +08:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
Tom Hughes
6fba59724a Update rubocop 2018-03-26 18:49:50 +01:00
Tom Hughes
85f942bb62 Revert to dalli 2.7.6 2018-03-26 09:44:33 +01:00
Tom Hughes
df19865364 Update bundle 2018-03-26 08:54:38 +01:00
Andy Allan
a20e28809f Merge branch 'master' into moderation 2018-02-28 15:55:28 +08:00
Andy Allan
424b6ef1cf Merge branch 'master' into moderation 2018-02-28 15:46:25 +08:00
Tom Hughes
c46a0ddaa3 Update to rails 5.1.5 2018-02-25 20:52:22 +00:00
Tom Hughes
1b89b29e82 Update bundle 2018-02-14 21:38:01 +00:00
Tom Hughes
ef6eedbad2 Update paperclip 2018-01-24 14:36:52 +00:00
Tom Hughes
3988940e3c Update bundle 2018-01-22 18:55:45 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Tom Hughes
2ef803b9df Update rack-test and patch test issues 2017-11-29 20:35:17 +00:00
Tom Hughes
cdf299e4c6 Update bundle 2017-11-29 16:33:56 +00:00
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
51be94a25d Update bundle 2017-10-29 19:35:26 +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
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
e057175ca9 Repair bundle 2017-10-05 19:31:52 +01:00
Tom Hughes
4f20850e55 Update bundle 2017-10-05 08:32:51 +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
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
Tom Hughes
4bd49a8cd7 Update bundle 2017-07-31 21:55:32 +01:00
Tom Hughes
8c513beec6 Update rack-cors and fix tests for changes in behaviour 2017-07-31 21:55:01 +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
d892a9be52 Update bundle 2017-06-20 19:03:14 +01:00
Tom Hughes
3cb294bebd Update bundle 2017-06-11 19:32:51 +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