mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 14:26:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into fix/layout

Browse Source
This commit is contained in:
Brenda Wallace
2018-03-16 14:55:03 +13:00
committed by GitHub
parent 2f81d6c78d 64a8cfb59f
commit dc09a6ea91
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -155,3 +155,4 @@ end
group :travis do
gem 'platform-api'
end
gem 'rack-protection', '>= 2.0.1'

6
Gemfile.lock
View File

@@ -378,8 +378,8 @@ GEM
public_suffix (3.0.1)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
rack-protection (2.0.0)
rack (1.6.9)
rack-protection (2.0.1)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -606,6 +606,7 @@ DEPENDENCIES
poltergeist
pry
quiet_assets
rack-protection (>= 2.0.1)
rails (~> 4.2.8)
rails-assets-leaflet.markercluster!
rails_12factor
@@ -629,6 +630,5 @@ DEPENDENCIES
RUBY VERSION
ruby 2.4.1p111
BUNDLED WITH
1.16.1