mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 13:10:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into wider-gardens

Browse Source
This commit is contained in:
Brenda Wallace
2019-10-19 10:50:16 +13:00
committed by GitHub
parent a6cb81f4d1 f50417cc04
commit 95affc8ca8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -46,7 +46,7 @@ gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions
# Maps
gem 'leaflet-rails'
gem 'rails-assets-leaflet.markercluster'
gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
gem 'pg', '< 1.0.0' # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
gem 'ruby-units' # for unit conversion

3
Gemfile.lock
View File

@@ -1,5 +1,6 @@
GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
abstract_type (0.0.7)
actioncable (5.2.2.1)
@@ -631,7 +632,7 @@ DEPENDENCIES
puma
rack-protection (>= 2.0.1)
rails (= 5.2.2.1)
rails-assets-leaflet.markercluster
rails-assets-leaflet.markercluster!
rails-controller-testing
rails_12factor
rake (>= 10.0.0)