gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge c1352015de into 448eb66fc0

Browse source
This commit is contained in:
depfu[bot] 2018-08-31 21:41:48 +00:00 • committed by GitHub
commit 0e59d36e50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Gemfile.lock
View file

@ -97,13 +97,13 @@ GEM
builder (3.2.3) builder (3.2.3)
byebug (9.0.6) byebug (9.0.6)
cancancan (2.2.0) cancancan (2.2.0)
capybara (2.6.2) capybara (3.6.0)
addressable addressable
mime-types (>= 1.16) mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3) nokogiri (~> 1.8)
rack (>= 1.0.0) rack (>= 1.6.0)
rack-test (>= 0.5.4) rack-test (>= 0.6.3)
xpath (~> 2.0) xpath (~> 3.1)
carrierwave (0.11.0) carrierwave (0.11.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
@ -193,7 +193,7 @@ GEM
formtastic-bootstrap (3.1.1) formtastic-bootstrap (3.1.1)
formtastic (>= 3.0) formtastic (>= 3.0)
geocoder (1.4.9) geocoder (1.4.9)
globalid (0.4.0) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gravtastic (3.2.6) gravtastic (3.2.6)
guard (2.14.1) guard (2.14.1)
@ -269,17 +269,18 @@ GEM
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.12) lumberjack (1.0.12)
mail (2.6.6) mail (2.7.0)
mime-types (>= 1.16, < 4) mini_mime (>= 0.1.1)
method_source (0.8.2) method_source (0.8.2)
mime-types (3.1) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2018.0812)
mimemagic (0.3.2) mimemagic (0.3.2)
mina (0.3.8) mina (0.3.8)
open4 (~> 1.3.4) open4 (~> 1.3.4)
rake rake
mini_magick (4.8.0) mini_magick (4.8.0)
mini_mime (1.0.1)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
minitest (5.11.3) minitest (5.11.3)
momentjs-rails (2.8.1) momentjs-rails (2.8.1)
@ -344,10 +345,9 @@ GEM
actionpack actionpack
activesupport activesupport
rails (>= 3.0.0) rails (>= 3.0.0)
poltergeist (1.9.0) poltergeist (1.18.1)
capybara (~> 2.1) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
powerpack (0.1.1) powerpack (0.1.1)
prawn (1.0.0) prawn (1.0.0)
@ -363,7 +363,7 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
public_suffix (3.0.2) public_suffix (3.0.3)
puma (3.12.0) puma (3.12.0)
rack (2.0.5) rack (2.0.5)
rack-openid (1.3.1) rack-openid (1.3.1)
@ -575,8 +575,8 @@ GEM
whenever (0.9.2) whenever (0.9.2)
activesupport (>= 2.3.4) activesupport (>= 2.3.4)
chronic (>= 0.6.3) chronic (>= 0.6.3)
xpath (2.0.0) xpath (3.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.8)
yajl-ruby (1.3.1) yajl-ruby (1.3.1)
PLATFORMS PLATFORMS