Skip to content

Commit

Permalink
Merge branch '802-gem-upd' into 'development'
Browse files Browse the repository at this point in the history
Resolve "Gem upd"

Closes #802

See merge request ComPlat/chemotion_ELN!1037
  • Loading branch information
PiTrem committed Sep 12, 2019
2 parents b558e6d + f0d0c95 commit 1b251b4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -73,7 +73,7 @@ gem 'net-sftp'
gem 'net-ssh'

# svg composer
gem 'nokogiri', '~> 1.8.2'
gem 'nokogiri'

# SFTP client
gem 'fun_sftp', git: 'https://github.com/fl9/fun_sftp.git',
Expand Down Expand Up @@ -105,8 +105,8 @@ gem 'faraday_middleware', '~> 0.12.1'
gem 'httparty'

gem 'ketcherails', '~> 0.1.6', git: 'https://github.com/ComPlat/ketcher-rails',
ref: 'c8200cfce01f9c4a8d36d22d74964b818f02d6ef'
#path: '../ketcher-rails'
ref: '0ad1dec8c8c91074873c93f2a73b57442ab03c6f'
# gem 'ketcherails', path: '../ketcher-rails'

# Free font icons
gem 'font-awesome-rails'
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Expand Up @@ -6,8 +6,8 @@ GIT

GIT
remote: https://github.com/ComPlat/ketcher-rails
revision: c8200cfce01f9c4a8d36d22d74964b818f02d6ef
ref: c8200cfce01f9c4a8d36d22d74964b818f02d6ef
revision: 0ad1dec8c8c91074873c93f2a73b57442ab03c6f
ref: 0ad1dec8c8c91074873c93f2a73b57442ab03c6f
specs:
ketcherails (0.1.6)
active_model_serializers (< 0.10.0)
Expand All @@ -22,7 +22,7 @@ GIT
jquery-rails
jquery-ui-rails (~> 5.0.5)
kaminari
nokogiri (~> 1.8.2)
nokogiri (>= 1.8.2, < 2.0)
openbabel
paperclip (~> 5.2.0)
rails (~> 4.2.11)
Expand Down Expand Up @@ -153,7 +153,7 @@ GEM
open4 (~> 1.3.0)
thor (>= 0.15.4, < 2)
barby (0.6.6)
bcrypt (3.1.12)
bcrypt (3.1.13)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand Down Expand Up @@ -244,10 +244,10 @@ GEM
delayed_job (>= 3.0, < 5)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.6.2)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
Expand Down Expand Up @@ -386,7 +386,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_xml (0.6.0)
Expand All @@ -402,8 +402,8 @@ GEM
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (5.2.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
open4 (1.3.4)
orm_adapter (0.5.0)
paperclip (5.2.1)
Expand Down Expand Up @@ -457,7 +457,7 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
Expand Down Expand Up @@ -693,7 +693,7 @@ DEPENDENCIES
meta_request
net-sftp
net-ssh
nokogiri (~> 1.8.2)
nokogiri
openbabel (= 2.4.90.3)!
paranoia (~> 2.0)
pg (~> 0.20.0)
Expand Down

0 comments on commit 1b251b4

Please sign in to comment.