cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8902 commits 4 branches 1 tag 499 MiB
Commit graph

217 commits

Author SHA1 Message Date
Tom Hughes
9bd634405b Fix rubocop warning 2018-11-07 09:16:14 +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
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
7c7ff4fdf7 Stick with autoprefixer 8.x for now 2018-08-12 20:30:20 +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
5f5f31ee7e Fix rubocop warnings 2018-06-19 09:05:32 +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
Chris Flipse
25256a4849 Make rubocop happy 2018-06-17 20:40:48 -04: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
Andy Allan
8d724600f3 Add better_errors gem for easier debugging 2018-04-11 14:07:38 +08: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
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
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