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

Merge pull request #68 from CactusPuppy/pull-upstream

Browse source 
Pull upstream changes into fork
This commit is contained in:
CactusPuppy 2021-04-13 12:03:32 -07:00 • committed by GitHub
commit e2c30d22d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -65,8 +65,8 @@ GEM
awesome_nested_set (>= 3.0) awesome_nested_set (>= 3.0)
acts_as_list (0.9.19) acts_as_list (0.9.19)
activerecord (>= 3.0) activerecord (>= 3.0)
addressable (2.6.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2) afm (0.2.2)
ajax-datatables-rails (0.4.3) ajax-datatables-rails (0.4.3)
railties (>= 4.0) railties (>= 4.0)
@ -96,13 +96,13 @@ GEM
builder (3.2.4) builder (3.2.4)
byebug (11.1.3) byebug (11.1.3)
cancancan (2.3.0) cancancan (2.3.0)
capybara (3.26.0) capybara (3.35.3)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
rack (>= 1.6.0) rack (>= 1.6.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (~> 1.5) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
carrierwave (2.1.1) carrierwave (2.1.1)
activemodel (>= 5.0.0) activemodel (>= 5.0.0)
@ -423,7 +423,7 @@ GEM
pry-byebug (3.8.0) pry-byebug (3.8.0)
byebug (~> 11.0) byebug (~> 11.0)
pry (~> 0.10) pry (~> 0.10)
public_suffix (3.1.1) public_suffix (4.0.6)
puma (5.2.2) puma (5.2.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
@ -492,7 +492,7 @@ GEM
recaptcha (4.14.0) recaptcha (4.14.0)
json json
redcarpet (3.5.1) redcarpet (3.5.1)
regexp_parser (1.6.0) regexp_parser (2.1.1)
request_store (1.4.1) request_store (1.4.1)
rack (>= 1.4) rack (>= 1.4)
responders (2.4.1) responders (2.4.1)