Skip to content

Commit

Permalink
Fix: Documentation rendering (#107)
Browse files Browse the repository at this point in the history
* Auto stash before merge of "upstream" and "upstream/master"

* fix haml gem version
  • Loading branch information
syphax-bouazzouni authored Nov 29, 2022
1 parent 64742d1 commit 672b29b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ test/test_run.log
test/data/ontology_files/catalog-v001.xml

create_permissions.log

ontologies_api.iml
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gem 'unicorn'
gem 'unicorn-worker-killer'

# Templating
gem 'haml'
gem 'haml', '~> 5.2.2'
gem 'redcarpet'

# NCBO
Expand Down
15 changes: 7 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_cron.git
revision: 5683c127113cf8eee68445413443ba3e164fbed7
revision: a1a4babc0b5e36325b5af667a6a50b7af1f5f891
branch: master
specs:
ncbo_cron (0.0.1)
Expand Down Expand Up @@ -177,9 +177,8 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
haml (6.0.10)
temple (>= 0.8.2)
thor
haml (5.2.2)
temple (>= 0.8.0)
tilt
http-accept (1.7.0)
http-cookie (1.0.5)
Expand Down Expand Up @@ -216,7 +215,7 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-ssh (7.0.1)
netrc (0.11.0)
newrelic_rpm (8.13.0)
newrelic_rpm (8.13.1)
oj (2.18.5)
omni_logger (0.1.4)
logger
Expand Down Expand Up @@ -309,7 +308,6 @@ GEM
net-ssh (>= 2.8.0)
systemu (2.6.5)
temple (0.9.1)
thor (1.2.1)
tilt (2.0.11)
trailblazer-option (0.1.2)
tzinfo (2.0.5)
Expand All @@ -329,6 +327,7 @@ GEM
webrick (1.7.0)

PLATFORMS
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -344,7 +343,7 @@ DEPENDENCIES
faraday (~> 1.9)
ffi
goo!
haml
haml (~> 5.2.2)
json-schema (~> 2.0)
minitest (~> 4.0)
minitest-stub_any_instance
Expand Down Expand Up @@ -382,4 +381,4 @@ DEPENDENCIES
unicorn-worker-killer

BUNDLED WITH
2.3.11
2.3.23

0 comments on commit 672b29b

Please sign in to comment.