mirror of
https://github.com/indentlabs/notebook.git
synced 2025-10-26 11:19:22 +00:00
Merge branch 'master' into document-analysis
This commit is contained in:
Andrew Brown
commit
2c9da445db
2
Gemfile
2
Gemfile
@ -116,7 +116,7 @@ group :test do
|
||||
gem 'rspec-rails'
|
||||
gem 'webmock'
|
||||
gem 'rubocop', require: false
|
||||
gem 'ruby-prof', '0.18.0'
|
||||
gem 'ruby-prof', '1.0.0'
|
||||
gem 'shoulda-matchers', '~> 4.1'
|
||||
gem 'rails-controller-testing'
|
||||
end
|
||||
|
||||
54
Gemfile.lock
54
Gemfile.lock
@ -67,10 +67,10 @@ GEM
|
||||
ast (2.4.0)
|
||||
authority (3.3.0)
|
||||
activesupport (>= 3.0.0)
|
||||
autoprefixer-rails (9.5.1.1)
|
||||
autoprefixer-rails (9.6.1)
|
||||
execjs
|
||||
aws-eventstream (1.0.3)
|
||||
aws-partitions (1.184.0)
|
||||
aws-partitions (1.193.0)
|
||||
aws-sdk (3.0.1)
|
||||
aws-sdk-resources (~> 3)
|
||||
aws-sdk-acm (1.14.0)
|
||||
@ -202,7 +202,7 @@ GEM
|
||||
aws-sdk-connect (1.10.0)
|
||||
aws-sdk-core (~> 3, >= 3.39.0)
|
||||
aws-sigv4 (~> 1.0)
|
||||
aws-sdk-core (3.59.0)
|
||||
aws-sdk-core (3.61.1)
|
||||
aws-eventstream (~> 1.0, >= 1.0.2)
|
||||
aws-partitions (~> 1.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
@ -360,8 +360,8 @@ GEM
|
||||
aws-sdk-kinesisvideomedia (1.7.0)
|
||||
aws-sdk-core (~> 3, >= 3.39.0)
|
||||
aws-sigv4 (~> 1.0)
|
||||
aws-sdk-kms (1.23.0)
|
||||
aws-sdk-core (~> 3, >= 3.58.0)
|
||||
aws-sdk-kms (1.24.0)
|
||||
aws-sdk-core (~> 3, >= 3.61.1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-lambda (1.18.0)
|
||||
aws-sdk-core (~> 3, >= 3.39.0)
|
||||
@ -668,8 +668,8 @@ GEM
|
||||
aws-sdk-route53resolver (1.1.0)
|
||||
aws-sdk-core (~> 3, >= 3.39.0)
|
||||
aws-sigv4 (~> 1.0)
|
||||
aws-sdk-s3 (1.45.0)
|
||||
aws-sdk-core (~> 3, >= 3.58.0)
|
||||
aws-sdk-s3 (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.61.1)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3control (1.1.0)
|
||||
@ -794,7 +794,7 @@ GEM
|
||||
bundler-audit (0.6.1)
|
||||
bundler (>= 1.2.0, < 3)
|
||||
thor (~> 0.18)
|
||||
capybara (3.26.0)
|
||||
capybara (3.27.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (~> 1.8)
|
||||
@ -907,8 +907,8 @@ GEM
|
||||
haml (5.0.4)
|
||||
temple (>= 0.8.0)
|
||||
tilt
|
||||
hashdiff (0.4.0)
|
||||
html-pipeline (2.11.0)
|
||||
hashdiff (1.0.0)
|
||||
html-pipeline (2.11.1)
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
htmlentities (4.3.4)
|
||||
@ -997,10 +997,10 @@ GEM
|
||||
mustache (1.1.0)
|
||||
nenv (0.3.0)
|
||||
nested_form (0.3.2)
|
||||
net-http-persistent (3.0.1)
|
||||
net-http-persistent (3.1.0)
|
||||
connection_pool (~> 2.2)
|
||||
newrelic_rpm (6.5.0.357)
|
||||
nio4r (2.3.1)
|
||||
nio4r (2.4.0)
|
||||
nokogiri (1.10.3)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.1)
|
||||
@ -1008,7 +1008,7 @@ GEM
|
||||
notiffany (0.1.1)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
onebox (1.8.90)
|
||||
onebox (1.9.6)
|
||||
htmlentities (~> 4.3)
|
||||
moneta (~> 1.0)
|
||||
multi_json (~> 1.11)
|
||||
@ -1099,14 +1099,14 @@ GEM
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
rake (12.3.2)
|
||||
rake (12.3.3)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-gravatar (1.0.5)
|
||||
rb-inotify (0.10.0)
|
||||
ffi (~> 1.0)
|
||||
redcarpet (3.4.0)
|
||||
redcarpet (3.5.0)
|
||||
redis (4.1.2)
|
||||
regexp_parser (1.5.1)
|
||||
regexp_parser (1.6.0)
|
||||
remotipart (1.4.2)
|
||||
responders (2.4.1)
|
||||
actionpack (>= 4.2.0, < 6.0)
|
||||
@ -1137,14 +1137,14 @@ GEM
|
||||
rspec-mocks (~> 3.8.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-support (3.8.0)
|
||||
rubocop (0.73.0)
|
||||
rubocop (0.74.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.6)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 1.7)
|
||||
ruby-prof (0.18.0)
|
||||
ruby-prof (1.0.0)
|
||||
ruby-progressbar (1.10.1)
|
||||
ruby_dep (1.5.0)
|
||||
rubyzip (1.2.3)
|
||||
@ -1167,7 +1167,7 @@ GEM
|
||||
sassc (2.0.1)
|
||||
ffi (~> 1.9)
|
||||
rake
|
||||
sassc-rails (2.1.1)
|
||||
sassc-rails (2.1.2)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
@ -1177,7 +1177,7 @@ GEM
|
||||
childprocess (>= 0.5, < 2.0)
|
||||
rubyzip (~> 1.2, >= 1.2.2)
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (4.1.1)
|
||||
shoulda-matchers (4.1.2)
|
||||
activesupport (>= 4.2.0)
|
||||
sidekiq (5.2.7)
|
||||
connection_pool (~> 2.2, >= 2.2.2)
|
||||
@ -1204,7 +1204,7 @@ GEM
|
||||
sqlite3 (1.4.1)
|
||||
stackprof (0.2.12)
|
||||
statsd-ruby (1.4.0)
|
||||
stripe (4.21.3)
|
||||
stripe (4.22.0)
|
||||
faraday (~> 0.13)
|
||||
net-http-persistent (~> 3.0)
|
||||
stripe_event (2.2.0)
|
||||
@ -1215,7 +1215,7 @@ GEM
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
thor (0.20.3)
|
||||
thread_safe (0.3.6)
|
||||
thredded (0.16.11)
|
||||
thredded (0.16.12)
|
||||
active_record_union (>= 1.3.0)
|
||||
autoprefixer-rails
|
||||
db_text_search (~> 0.3.0)
|
||||
@ -1229,7 +1229,7 @@ GEM
|
||||
nokogiri
|
||||
onebox (~> 1.8, >= 1.8.48)
|
||||
pundit (>= 1.1.0)
|
||||
rails (>= 4.2.10)
|
||||
rails (>= 4.2.10, <= 6.0.0.rc2)
|
||||
rb-gravatar
|
||||
rinku
|
||||
sanitize
|
||||
@ -1257,13 +1257,13 @@ GEM
|
||||
activemodel (>= 5.0)
|
||||
bindex (>= 0.4.0)
|
||||
railties (>= 5.0)
|
||||
webmock (3.6.0)
|
||||
webmock (3.6.2)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
websocket-driver (0.7.0)
|
||||
websocket-driver (0.7.1)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.3)
|
||||
websocket-extensions (0.1.4)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
|
||||
@ -1330,7 +1330,7 @@ DEPENDENCIES
|
||||
rspec-prof
|
||||
rspec-rails
|
||||
rubocop
|
||||
ruby-prof (= 0.18.0)
|
||||
ruby-prof (= 1.0.0)
|
||||
sass-rails
|
||||
selenium-webdriver
|
||||
serendipitous!
|
||||
|
||||
Loading…
Reference in New Issue
Block a user