Commit graph

266 commits

Author SHA1 Message Date
Tom Hughes
89d387e66a Revert to rinku 2.0.4 2019-02-14 21:25:34 +00:00
Tom Hughes
affd87c528 Revert to bootsnap 1.3.2 2019-02-14 19:24:46 +00:00
Tom Hughes
4d14b6a169 Update bundle 2019-02-13 18:45:32 +00:00
Tom Hughes
007da72bdd Update bundle 2019-02-07 18:41:36 +00:00
Tom Hughes
c18e679be3 Merge remote-tracking branch 'upstream/pull/2125' 2019-02-06 18:15:40 +00:00
Tom Hughes
8c13f4597a Revert to kramdown 1.x for now
https://github.com/gettalong/kramdown/issues/571
2019-01-31 13:53:28 +00:00
Tom Hughes
45a454c2c8 Add browser detection framework 2019-01-30 12:11:34 +00:00
Tom Hughes
7a4b896ee7 Update bundle 2019-01-30 12:06:21 +00:00
Tom Hughes
3e7bc943fe Merge remote-tracking branch 'upstream/pull/2120' 2019-01-28 19:04:02 +00:00
Andy Allan
d02e4ad461 Write some basic functionality tests for trace.import 2019-01-23 16:47:54 +01:00
Andy Allan
6820d53e5f Use gd-ffij gem to create trace icons
This is a port of the gd-based code from the gpx-importer at
https://github.com/openstreetmap/gpx-import

The gd-ffij library does not yet have support for animated gifs, so
we just create a static image for now. But at least that's better than
the non-functioning RMagick code.
2019-01-16 16:06:25 +01:00
Tom Hughes
1f3372f52c Switch to using kramdown for markdown formatting
Fixes #2103
2019-01-16 10:10:48 +00:00
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