Merge branch 'master' into port-tests
This commit is contained in:
4
Gemfile
4
Gemfile
@@ -22,8 +22,8 @@ gem 'rubyzip', '~> 2.3'
|
|||||||
gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
|
gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
|
||||||
gem 'rake', '~> 13.2'
|
gem 'rake', '~> 13.2'
|
||||||
gem 'otr-activerecord', '~> 2.2.0'
|
gem 'otr-activerecord', '~> 2.2.0'
|
||||||
gem 'sqlite3', '~> 1.7'
|
gem 'sqlite3', '~> 1.4'
|
||||||
gem 'rubocop', '~> 1.63.3', require: false
|
gem 'rubocop', '~> 1.63.4', require: false
|
||||||
|
|
||||||
# Geolocation support
|
# Geolocation support
|
||||||
group :geoip do
|
group :geoip do
|
||||||
|
|||||||
16
Gemfile.lock
16
Gemfile.lock
@@ -115,7 +115,7 @@ GEM
|
|||||||
hashie-forbidden_attributes (~> 0.1)
|
hashie-forbidden_attributes (~> 0.1)
|
||||||
parallel (1.24.0)
|
parallel (1.24.0)
|
||||||
parseconfig (1.1.2)
|
parseconfig (1.1.2)
|
||||||
parser (3.3.0.5)
|
parser (3.3.1.0)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
racc
|
racc
|
||||||
power_assert (2.0.3)
|
power_assert (2.0.3)
|
||||||
@@ -166,7 +166,7 @@ GEM
|
|||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.13.0)
|
rspec-support (~> 3.13.0)
|
||||||
rspec-support (3.13.0)
|
rspec-support (3.13.0)
|
||||||
rubocop (1.63.3)
|
rubocop (1.63.4)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (>= 3.17.0)
|
language_server-protocol (>= 3.17.0)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
@@ -177,8 +177,8 @@ GEM
|
|||||||
rubocop-ast (>= 1.31.1, < 2.0)
|
rubocop-ast (>= 1.31.1, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 3.0)
|
unicode-display_width (>= 2.4.0, < 3.0)
|
||||||
rubocop-ast (1.31.2)
|
rubocop-ast (1.31.3)
|
||||||
parser (>= 3.3.0.4)
|
parser (>= 3.3.1.0)
|
||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
ruby2_keywords (0.0.5)
|
ruby2_keywords (0.0.5)
|
||||||
rubyzip (2.3.2)
|
rubyzip (2.3.2)
|
||||||
@@ -196,8 +196,8 @@ GEM
|
|||||||
rack-protection (= 3.2.0)
|
rack-protection (= 3.2.0)
|
||||||
tilt (~> 2.0)
|
tilt (~> 2.0)
|
||||||
slack-notifier (2.4.0)
|
slack-notifier (2.4.0)
|
||||||
sqlite3 (1.7.3-arm64-darwin)
|
sqlite3 (2.0.1-arm64-darwin)
|
||||||
sqlite3 (1.7.3-x86_64-linux)
|
sqlite3 (2.0.1-x86_64-linux-gnu)
|
||||||
stringio (3.1.0)
|
stringio (3.1.0)
|
||||||
sync (0.5.0)
|
sync (0.5.0)
|
||||||
term-ansicolor (1.8.0)
|
term-ansicolor (1.8.0)
|
||||||
@@ -277,13 +277,13 @@ DEPENDENCIES
|
|||||||
rdoc (~> 6.6)
|
rdoc (~> 6.6)
|
||||||
rest-client (~> 2.1.0)
|
rest-client (~> 2.1.0)
|
||||||
rspec (~> 3.13)
|
rspec (~> 3.13)
|
||||||
rubocop (~> 1.63.3)
|
rubocop (~> 1.63.4)
|
||||||
rubyzip (~> 2.3)
|
rubyzip (~> 2.3)
|
||||||
rushover (~> 0.3.0)
|
rushover (~> 0.3.0)
|
||||||
selenium-webdriver (~> 4.20)
|
selenium-webdriver (~> 4.20)
|
||||||
sinatra (~> 3.2)
|
sinatra (~> 3.2)
|
||||||
slack-notifier (~> 2.4)
|
slack-notifier (~> 2.4)
|
||||||
sqlite3 (~> 1.7)
|
sqlite3 (~> 2.0)
|
||||||
term-ansicolor
|
term-ansicolor
|
||||||
test-unit-full (~> 0.0.5)
|
test-unit-full (~> 0.0.5)
|
||||||
thin (~> 1.8)
|
thin (~> 1.8)
|
||||||
|
|||||||
Reference in New Issue
Block a user