zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 14:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1657 from internetee/upgrade-json-to-2.3

Browse source 
Upgrade sdoc to 1.1, JSON to 2.3.1
This commit is contained in:
Timo Võhmar 2020-08-07 19:32:33 +03:00 • committed by GitHub
commit d165df79a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -81,10 +81,10 @@ end
group :development, :test do group :development, :test do
gem 'pry', '0.10.1' gem 'pry', '0.10.1'
gem 'sdoc', '0.4.1' # bundle exec rake doc:rails generates the API under doc/api.
gem 'railroady', '1.3.0' # to generate database diagrams gem 'railroady', '1.3.0' # to generate database diagrams
gem 'autodoc' gem 'autodoc'
gem 'puma' gem 'puma'
gem 'sdoc', '~> 1.1'
end end
group :test do group :test do

11
Gemfile.lock
View file

@ -253,7 +253,7 @@ GEM
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (5.0.5)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.6) json (2.3.1)
kaminari (1.2.1) kaminari (1.2.1)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1) kaminari-actionview (= 1.2.1)
@ -377,7 +377,7 @@ GEM
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rbtree3 (0.6.0) rbtree3 (0.6.0)
rdoc (4.3.0) rdoc (6.2.1)
regexp_parser (1.7.1) regexp_parser (1.7.1)
request_store (1.5.0) request_store (1.5.0)
rack (>= 1.4) rack (>= 1.4)
@ -423,9 +423,8 @@ GEM
nokogiri (>= 1.8.1) nokogiri (>= 1.8.1)
nori (~> 2.4) nori (~> 2.4)
wasabi (~> 3.4) wasabi (~> 3.4)
sdoc (0.4.1) sdoc (1.1.0)
json (~> 1.7, >= 1.7.7) rdoc (>= 5.0)
rdoc (~> 4.0)
select2-rails (3.5.9.3) select2-rails (3.5.9.3)
thor (~> 0.14) thor (~> 0.14)
selectize-rails (0.12.1) selectize-rails (0.12.1)
@ -545,7 +544,7 @@ DEPENDENCIES
ransack (~> 2.3) ransack (~> 2.3)
rest-client rest-client
sass-rails sass-rails
sdoc (= 0.4.1) sdoc (~> 1.1)
select2-rails (= 3.5.9.3) select2-rails (= 3.5.9.3)
selectize-rails (= 0.12.1) selectize-rails (= 0.12.1)
simplecov (= 0.17.1) simplecov (= 0.17.1)