scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 01:35:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #885 from ZmagoD/zd_SCI_1817

Browse source 
fixes dependencies issue [fix SCI-1817]
This commit is contained in:
Zmago Devetak 2017-11-16 10:50:32 +01:00 committed by GitHub
commit a2af2fcd7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -155,9 +155,8 @@ GEM
commit_param_routing (0.0.1) commit_param_routing (0.0.1)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
crass (1.0.2) crass (1.0.2)
creek (2.0) creek (1.1.2)
httparty (~> 0.15.5) nokogiri (~> 1.6.0)
nokogiri (~> 1.7.0)
rubyzip (>= 1.0.0) rubyzip (>= 1.0.0)
cucumber (3.0.1) cucumber (3.0.1)
builder (>= 2.1.2) builder (>= 2.1.2)
@ -222,8 +221,6 @@ GEM
globalid (0.4.0) globalid (0.4.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
hammerjs-rails (2.0.8) hammerjs-rails (2.0.8)
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.9.0) i18n (0.9.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n-js (3.0.1) i18n-js (3.0.1)
@ -286,14 +283,13 @@ GEM
railties (>= 3.1) railties (>= 3.1)
multi_json (1.12.2) multi_json (1.12.2)
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.6.0)
nested_form_fields (0.8.2) nested_form_fields (0.8.2)
coffee-rails (>= 3.2.1) coffee-rails (>= 3.2.1)
jquery-rails jquery-rails
rails (>= 3.2.0) rails (>= 3.2.0)
newrelic_rpm (4.5.0.337) newrelic_rpm (4.5.0.337)
nio4r (2.1.0) nio4r (2.1.0)
nokogiri (1.7.2) nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
nokogumbo (1.4.13) nokogumbo (1.4.13)
nokogiri nokogiri
@ -595,4 +591,4 @@ RUBY VERSION
ruby 2.4.1p111 ruby 2.4.1p111
BUNDLED WITH BUNDLED WITH
1.15.4 1.16.0