Commit graph

254 commits

Author SHA1 Message Date
Tom Hughes
fac3f0ef24 Update bundle 2019-01-08 18:21:03 +00:00
Tom Hughes
97bf1b303c Revert to omniauth-google-oauth2 version 0.5.3 2019-01-08 09:41:15 +00:00
Tom Hughes
b28e3052b0 Update bundle 2019-01-07 08:58:37 +00:00
Tom Hughes
177b2c3e65 Update to rails 5.2.2 2018-12-04 20:41:22 +00:00
Tom Hughes
b29c173ac7 Update to rails 5.2.1.1 2018-11-27 23:10:24 +00:00
Tom Hughes
28e011e219 Update to rails 5.2.1 2018-11-14 22:35:44 +00:00
Tom Hughes
cdb42d2a6c Avoid ordering points from public and private traces
Closes #2046
2018-11-07 08:57:14 +00:00
Tom Hughes
16bef0c8ec Merge remote-tracking branch 'upstream/pull/2023' 2018-11-03 14:34:18 +00:00
Tom Hughes
2e14b1106e Update to sassc 2.x 2018-11-01 22:41:06 +00:00
Tom Hughes
c26ecce7d3 Update bundle 2018-11-01 18:23:43 +00:00
Tom Hughes
0e7cc08c7b Merge remote-tracking branch 'upstream/pull/2037' 2018-11-01 18:01:25 +00:00
Tom Hughes
00f82918e6 Update bundle 2018-10-31 19:14:39 +00:00
Andy Allan
801522c5c3 Set up Delayed Job as the backend for Active Job
This persists jobs into the database, and uses locking to ensure that
workers from multiple machines avoid treading on each other.

Jobs can be run by using `bundle exec rake jobs:work`

Fixes #2015
2018-10-31 15:31:32 +01:00
Andy Allan
420a7289a0 Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz 2018-10-10 11:26:30 +02:00
Tom Hughes
fbd6909b91 Update bundle 2018-09-22 17:08:49 +01:00
Tom Hughes
5becbc6ee0 Update bundle 2018-09-10 22:43:58 +01:00
Tom Hughes
6c597f614b Update bundle 2018-08-28 18:57:32 +01:00
Tom Hughes
7c7ff4fdf7 Stick with autoprefixer 8.x for now 2018-08-12 20:30:20 +01:00
Tom Hughes
828425c0c2 Fix bundle dependencies 2018-08-12 20:06:53 +01:00
Tom Hughes
907f63cc62 Replace sass-rails with sassc-rails
http://sass.logdown.com/posts/7081811
2018-08-12 19:53:51 +01:00
Tom Hughes
a3bbaa74ff Update bundle 2018-08-12 19:42:02 +01:00
Tom Hughes
1285bcbd71 Update bundle 2018-06-25 14:35:10 +01:00
Tom Hughes
a6b0106879 Update bundle 2018-06-22 12:05:45 +01:00
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
Andy Allan
ffa65d4d72 Add cancancan and the first ability definitions for site_controller 2018-06-17 13:56:23 -04: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