Merge pull request #269 from indentlabs/upgrade-thredded

Upgrade other gems
This commit is contained in:
Andrew Brown 2018-06-05 23:54:58 -05:00 committed by GitHub
commit 73b4a95bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 166 additions and 166 deletions

View File

@ -80,7 +80,7 @@ end
group :test, :production do
gem 'therubyracer', platforms: :ruby
gem 'pg'
gem 'pg', '~> 0.18'
end
group :test do
@ -90,7 +90,7 @@ group :test do
gem 'coveralls', require: false
gem 'cucumber-rails', require: false
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'factory_bot_rails'
gem 'guard'
gem 'guard-minitest'
gem 'guard-rubocop'

View File

@ -43,92 +43,96 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
ast (2.3.0)
authority (3.2.2)
ast (2.4.0)
authority (3.3.0)
activesupport (>= 3.0.0)
autoprefixer-rails (8.3.0)
autoprefixer-rails (8.6.0)
execjs
aws-sdk (1.66.0)
aws-sdk-v1 (= 1.66.0)
aws-sdk-v1 (1.66.0)
aws-sdk (1.67.0)
aws-sdk-v1 (= 1.67.0)
aws-sdk-v1 (1.67.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
nokogiri (~> 1)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
backports (3.11.3)
bcrypt (3.1.12)
better_errors (2.1.1)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
capybara (2.9.2)
capybara (3.2.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chartkick (2.1.1)
childprocess (0.5.9)
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
chartkick (2.3.4)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.9)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.1)
coffee-rails (4.2.1)
climate_control (0.2.0)
cocoon (1.2.11)
codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (>= 1.6.0, < 2)
coveralls (0.7.2)
multi_json (~> 1.3)
rest-client (= 1.6.7)
simplecov (>= 0.7)
term-ansicolor (= 1.2.2)
thor (= 0.18.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
cucumber (2.4.0)
cucumber (3.1.1)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
cucumber-core (~> 3.1.0)
cucumber-expressions (~> 6.0.0)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
gherkin (~> 4.0)
diff-lcs (~> 1.3)
gherkin (~> 5.1.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (1.5.0)
gherkin (~> 4.0)
cucumber-rails (1.4.5)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 4)
mime-types (>= 1.16, < 4)
nokogiri (~> 1.5)
railties (>= 3, < 5.1)
cucumber-core (3.1.0)
backports (>= 3.8.0)
cucumber-tag_expressions (~> 1.1.0)
gherkin (>= 5.0.0)
cucumber-expressions (6.0.0)
cucumber-rails (1.6.0)
capybara (>= 1.1.2, < 4)
cucumber (>= 3.0.2, < 4)
mime-types (>= 1.17, < 4)
nokogiri (~> 1.8)
railties (>= 4, < 6)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.5.3)
database_cleaner (1.7.0)
dateslices (0.0.4)
rails (> 4)
db_text_search (0.2.2)
activerecord (>= 4.1.15, < 6.0)
debug_inspector (0.0.2)
debug_inspector (0.0.3)
delayed_job (4.1.5)
activesupport (>= 3.0, < 5.3)
delayed_job_active_record (4.1.2)
activerecord (>= 3.0, < 5.2)
delayed_job_active_record (4.1.3)
activerecord (>= 3.0, < 5.3)
delayed_job (>= 3.0, < 5)
devise (4.4.3)
bcrypt (~> 3.0)
@ -136,30 +140,31 @@ GEM
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
erubi (1.7.1)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.7.0)
factory_bot (4.10.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
factory_bot_rails (4.10.0)
factory_bot (~> 4.10.0)
railties (>= 3.0.0)
ffi (1.9.23)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
filesize (0.1.1)
formatador (0.2.5)
friendly_id (5.2.3)
friendly_id (5.2.4)
activerecord (>= 4.0.0)
gemoji (2.1.0)
gherkin (4.0.0)
gherkin (5.1.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.0)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
@ -169,24 +174,22 @@ GEM
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
guard-rubocop (1.2.0)
guard-rubocop (1.3.0)
guard (~> 2.0)
rubocop (~> 0.20)
hashdiff (0.3.2)
html-pipeline (2.7.1)
hashdiff (0.3.7)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
httparty (0.13.7)
json (~> 1.8)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inline_svg (1.3.1)
activesupport (>= 3.0)
nokogiri (>= 1.6)
jaro_winkler (1.4.0)
json (1.8.6)
kaminari (1.1.1)
activesupport (>= 4.1.0)
@ -200,7 +203,7 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kramdown (1.16.2)
kramdown (1.17.0)
levenshtein-ffi (1.1.0)
ffi (~> 1.9)
libv8 (3.16.14.19)
@ -211,19 +214,20 @@ GEM
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.10)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
material_icons (2.2.0)
material_icons (2.2.1)
railties (>= 3.2)
medium-editor-rails (2.3.1)
railties (>= 3.0)
meta-tags (2.3.1)
actionpack (>= 3.2.0, <= 5.1.0)
method_source (0.8.2)
meta-tags (2.9.0)
actionpack (>= 3.2.0, < 5.3)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
@ -232,10 +236,10 @@ GEM
multi_json (1.13.1)
multi_test (0.1.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustache (1.0.5)
nenv (0.3.0)
netrc (0.11.0)
newrelic_rpm (4.5.0.337)
newrelic_rpm (5.2.0.345)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0)
@ -243,7 +247,7 @@ GEM
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
onebox (1.8.45)
onebox (1.8.48)
htmlentities (~> 4.3)
moneta (~> 1.0)
multi_json (~> 1.11)
@ -251,22 +255,23 @@ GEM
nokogiri (~> 1.7)
sanitize
orm_adapter (0.5.0)
paperclip (4.2.4)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
mime-types
parallel (1.12.0)
paranoia (2.4.0)
activerecord (>= 4.0, < 5.2)
parser (2.4.0.2)
ast (~> 2.3)
pg (0.19.0)
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
parallel (1.12.1)
paranoia (2.4.1)
activerecord (>= 4.0, < 5.3)
parser (2.5.1.0)
ast (~> 2.4.0)
pg (0.21.0)
powerpack (0.1.1)
pry (0.10.4)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
method_source (~> 0.9.0)
public_suffix (3.0.2)
puma (3.11.4)
puma-heroku (1.0.0)
puma (~> 3.0)
@ -275,7 +280,7 @@ GEM
rack (1.6.10)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.4.2)
rack-timeout (0.5.1)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
@ -297,7 +302,7 @@ GEM
loofah (~> 2.2, >= 2.2.2)
rails-jquery-autocomplete (1.0.3)
rails (>= 3.2)
rails-perftest (0.0.6)
rails-perftest (0.0.7)
rails-ujs (0.1.0)
railties (>= 3.1)
rails_12factor (0.0.3)
@ -310,65 +315,64 @@ GEM
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
rainbow (3.0.0)
rake (12.3.1)
raygun4ruby (1.1.11)
httparty (~> 0.13.7)
raygun4ruby (2.7.0)
concurrent-ruby
httparty (> 0.13.7)
json
rack
rb-fsevent (0.10.3)
rb-gravatar (1.0.5)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.3.4)
redcarpet (3.4.0)
ref (2.0.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rest-client (1.6.7)
mime-types (>= 1.16)
rinku (2.0.4)
rmagick (2.13.4)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rmagick (2.16.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (~> 3.7.0)
rspec-prof (0.0.7)
rspec (~> 3.0)
ruby-prof
rspec-rails (3.5.2)
rspec-rails (3.7.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (0.51.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (0.57.0)
jaro_winkler (~> 1.4.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-prof (0.15.9)
ruby-progressbar (1.9.0)
ruby_dep (1.4.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sanitize (4.6.4)
sanitize (4.6.5)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
@ -377,27 +381,25 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (2.53.4)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
rubyzip (~> 1.2)
shellany (0.0.1)
shoulda-matchers (3.1.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simplecov (0.12.0)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slack-notifier (1.5.1)
slop (3.6.0)
social-share-button (0.10.0)
simplecov-html (0.10.2)
slack-notifier (2.3.2)
social-share-button (1.1.0)
coffee-rails
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
@ -410,20 +412,22 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
stripe (1.56.0)
rest-client (>= 1.4, < 4.0)
stripe_event (1.9.1)
sqlite3 (1.3.13)
stripe (3.15.0)
faraday (~> 0.10)
stripe_event (2.1.1)
activesupport (>= 3.1)
stripe (>= 1.6, < 4.0)
term-ansicolor (1.4.0)
tins (~> 1.0)
stripe (>= 2.8, < 4.0)
term-ansicolor (1.2.2)
tins (~> 0.8)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thor (0.18.1)
thread_safe (0.3.6)
thredded (0.14.3)
thredded (0.14.4)
active_record_union (>= 1.3.0)
autoprefixer-rails
db_text_search (~> 0.2.0)
@ -444,28 +448,24 @@ GEM
sass (>= 3.4.21)
sprockets-es6
timeago_js
tilt (2.0.5)
tilt (2.0.8)
timeago_js (3.0.2)
tins (1.12.0)
tins (0.13.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2016.7)
tzinfo-data (1.2018.5)
tzinfo (>= 1.0.0)
uglifier (3.0.2)
uglifier (4.1.11)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode-display_width (1.4.0)
warden (1.2.7)
rack (>= 1.0)
webmock (2.3.2)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket (1.2.3)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (3.1.0)
nokogiri (~> 1.8)
PLATFORMS
ruby
@ -487,7 +487,7 @@ DEPENDENCIES
dateslices
delayed_job_active_record
devise
factory_girl_rails
factory_bot_rails
filesize
guard
guard-minitest
@ -500,7 +500,7 @@ DEPENDENCIES
newrelic_rpm
paperclip
paranoia
pg
pg (~> 0.18)
pry
puma (~> 3.7)
puma-heroku

View File

@ -1 +1 @@
Rack::Timeout.service_timeout = 20 # seconds
Rails.application.config.middleware.insert_before Rack::Runtime, Rack::Timeout, service_timeout: 20 # seconds

View File

@ -0,0 +1 @@
World(FactoryBot::Syntax::Methods)

View File

@ -1 +0,0 @@
World(FactoryGirl::Syntax::Methods)

View File

@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
sequence :email do |n|
"email#{n}@example.com"
end

View File

@ -55,7 +55,7 @@ RSpec.configure do |config|
# arbitrary gems may also be filtered via:
# config.filter_gems_from_backtrace("gem name")
config.include FactoryGirl::Syntax::Methods
config.include FactoryBot::Syntax::Methods
end
Shoulda::Matchers.configure do |config|

View File

@ -16,8 +16,8 @@
# users commonly want.
#
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
require 'codeclimate-test-reporter'
CodeClimate::TestReporter.start
require 'simplecov'
SimpleCov.start
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate