Skip to content

Commit

Permalink
Merge branch 'main' into joss
Browse files Browse the repository at this point in the history
  • Loading branch information
xuanxu committed Aug 17, 2023
2 parents fdb0058 + 66fd7dd commit f1505bf
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ if ENV["CUSTOM_RUBY_VERSION"]
end

gem 'octokit'
gem 'sinatra', '3.0.5'
gem 'sinatra-contrib', '3.0.5'
gem 'sinatra', '3.1.0'
gem 'sinatra-contrib', '3.1.0'
gem 'openssl'
gem 'puma'
gem 'sidekiq'
Expand Down
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
bibtex-ruby (6.0.0)
latex-decode (~> 0.0)
Expand All @@ -14,7 +14,7 @@ GEM
rexml
diff-lcs (1.5.0)
dotenv (2.8.1)
faraday (2.7.9)
faraday (2.7.10)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-follow_redirects (0.1.0)
Expand All @@ -38,13 +38,13 @@ GEM
reverse_markdown (>= 1, < 3)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
nio4r (2.5.9)
nokogiri (1.15.2)
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (6.1.1)
Expand All @@ -53,20 +53,20 @@ GEM
ojra (1.1.0)
faraday (~> 2.7)
openssl (3.1.0)
public_suffix (5.0.1)
public_suffix (5.0.3)
puma (6.3.0)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack-protection (3.0.5)
rack
rack (2.2.8)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
redis-client (0.14.1)
redis-client (0.15.0)
connection_pool
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.5)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand All @@ -76,7 +76,7 @@ GEM
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
Expand All @@ -96,16 +96,16 @@ GEM
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.14.0)
sinatra (3.0.5)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.5)
rack-protection (= 3.1.0)
tilt (~> 2.0)
sinatra-contrib (3.0.5)
sinatra-contrib (3.1.0)
multi_json
mustermann (~> 3.0)
rack-protection (= 3.0.5)
sinatra (= 3.0.5)
rack-protection (= 3.1.0)
sinatra (= 3.1.0)
tilt (~> 2.0)
thor (1.2.2)
tilt (2.2.0)
Expand Down Expand Up @@ -134,8 +134,8 @@ DEPENDENCIES
rspec
serrano
sidekiq
sinatra (= 3.0.5)
sinatra-contrib (= 3.0.5)
sinatra (= 3.1.0)
sinatra-contrib (= 3.1.0)
webmock

BUNDLED WITH
Expand Down

0 comments on commit f1505bf

Please sign in to comment.