Skip to content

Update gems with bummr #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monfresh merged 21 commits into from
Aug 8, 2017
Merged

Update gems with bummr #1594

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
10a4478
Update bummr from 0.1.8 to 0.2.1
monfresh Aug 8, 2017
1779656
Update dotiw from 3.1.1 to 4.0.0
monfresh Aug 8, 2017
d5bb4e1
Update faker from 1.7.3 to 1.8.4
monfresh Aug 8, 2017
8a98b37
Update front_matter_parser from 0.1.0 to 0.1.1
monfresh Aug 8, 2017
f6ee7dd
Update hashie from 3.5.5 to 3.5.6
monfresh Aug 8, 2017
76026ad
Update http_accept_language from 2.1.0 to 2.1.1
monfresh Aug 8, 2017
93ee23f
Update httparty from 0.15.4 to 0.15.6
monfresh Aug 8, 2017
0671294
Update i18n-tasks from 0.9.15 to 0.9.16
monfresh Aug 8, 2017
339b4be
Update lograge from 0.5.1 to 0.6.0
monfresh Aug 8, 2017
f55ed27
Update newrelic_rpm from 4.2.0.334 to 4.3.0.335
monfresh Aug 8, 2017
f4f1ce4
Update overcommit from 0.39.1 to 0.40.0
monfresh Aug 8, 2017
926a8fd
Update phonelib from 0.6.12 to 0.6.13
monfresh Aug 8, 2017
73b3618
Update poltergeist from 1.15.0 to 1.16.0
monfresh Aug 8, 2017
3abc3ca
Update premailer-rails from 1.9.6 to 1.9.7
monfresh Aug 8, 2017
f3caafb
Update rails from 4.2.8 to 4.2.9
monfresh Aug 8, 2017
f1a05d7
Update reek from 4.7.1 to 4.7.2
monfresh Aug 8, 2017
7da7194
Update savon from 2.11.1 to 2.11.2
monfresh Aug 8, 2017
1fece21
Update shoulda-matchers from 3.1.1 to 3.1.2
monfresh Aug 8, 2017
123ec18
Update sidekiq from 5.0.3 to 5.0.4
monfresh Aug 8, 2017
57f8535
Update timecop from 0.9.0 to 0.9.1
monfresh Aug 8, 2017
1f2cbf8
Update zxcvbn-js from 4.4.2 to 4.4.3
monfresh Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 59 additions & 57 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,36 +62,36 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actionmailer (4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
actionpack (4.2.9)
actionview (= 4.2.9)
activesupport (= 4.2.9)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
activejob (4.2.9)
activesupport (= 4.2.9)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
activemodel (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
activerecord (4.2.9)
activemodel (= 4.2.9)
activesupport (= 4.2.9)
arel (~> 6.0)
activesupport (4.2.8)
activesupport (4.2.9)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand Down Expand Up @@ -148,7 +148,7 @@ GEM
bullet (5.5.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
bummr (0.1.8)
bummr (0.2.1)
rainbow
thor
byebug (9.0.6)
Expand All @@ -171,14 +171,14 @@ GEM
capistrano-sidekiq (0.10.0)
capistrano
sidekiq (>= 3.4)
capybara (2.14.0)
capybara (2.15.1)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.6.3)
childprocess (0.7.1)
ffi (~> 1.0, >= 1.0.11)
choice (0.2.0)
chronic (0.10.2)
Expand Down Expand Up @@ -230,8 +230,8 @@ GEM
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.1)
dotiw (3.1.1)
actionpack (>= 3)
dotiw (4.0.0)
actionpack (>= 4)
i18n
dumb_delegator (0.8.0)
easy_translate (0.5.0)
Expand All @@ -254,7 +254,7 @@ GEM
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
faker (1.7.3)
faker (1.8.4)
i18n (~> 0.5)
fasterer (0.3.2)
colorize (~> 0.7)
Expand All @@ -267,7 +267,7 @@ GEM
thor (~> 0.14)
formatador (0.2.5)
foundation_emails (2.2.1.0)
front_matter_parser (0.1.0)
front_matter_parser (0.1.1)
geocoder (1.4.4)
get_process_mem (0.2.1)
gibberish (2.1.0)
Expand All @@ -290,19 +290,19 @@ GEM
gyoku (1.3.1)
builder (>= 2.1.2)
hashdiff (0.3.2)
hashie (3.5.5)
hashie (3.5.6)
heapy (0.1.2)
highline (1.7.8)
hiredis (0.6.1)
htmlentities (4.3.4)
http_accept_language (2.1.0)
httparty (0.15.4)
http_accept_language (2.1.1)
httparty (0.15.6)
multi_xml (>= 0.5.2)
httpi (2.4.2)
rack
socksify
i18n (0.8.6)
i18n-tasks (0.9.15)
i18n-tasks (0.9.16)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.0)
Expand All @@ -313,7 +313,7 @@ GEM
rainbow (~> 2.2)
terminal-table (>= 1.5.1)
ice_nine (0.11.2)
iniparse (1.4.2)
iniparse (1.4.4)
jmespath (1.3.1)
json (1.8.6)
json-jwt (1.7.2)
Expand All @@ -330,16 +330,17 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
logger (1.2.8)
lograge (0.5.1)
lograge (0.6.0)
actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2)
railties (>= 4, < 5.2)
request_store (~> 1.0)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.11)
macaddr (1.7.1)
systemu (~> 2.6.2)
mail (2.6.5)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mailcatcher (0.6.5)
eventmachine (= 1.0.9.1)
Expand All @@ -360,6 +361,7 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.3)
mini_portile2 (2.2.0)
minitest (5.10.2)
multi_json (1.12.1)
Expand All @@ -370,27 +372,27 @@ GEM
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
newrelic_rpm (4.2.0.334)
newrelic_rpm (4.3.0.335)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nori (2.6.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
overcommit (0.39.1)
childprocess (~> 0.6.3)
overcommit (0.40.0)
childprocess (~> 0.6, >= 0.6.3)
iniparse (~> 1.4)
parallel (1.11.2)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.21.0)
phonelib (0.6.12)
phonelib (0.6.13)
phony (2.15.44)
phony_rails (0.14.6)
activesupport (>= 3.0)
phony (> 2.15)
poltergeist (1.15.0)
poltergeist (1.16.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
Expand All @@ -399,7 +401,7 @@ GEM
addressable
css_parser (>= 1.4.10)
htmlentities (>= 4.0.0)
premailer-rails (1.9.6)
premailer-rails (1.9.7)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
pry (0.10.4)
Expand All @@ -425,16 +427,16 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
rails (4.2.9)
actionmailer (= 4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
activemodel (= 4.2.9)
activerecord (= 4.2.9)
activesupport (= 4.2.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
railties (= 4.2.9)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -450,9 +452,9 @@ GEM
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_layout (1.0.41)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (4.2.9)
actionpack (= 4.2.9)
activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
Expand All @@ -466,7 +468,7 @@ GEM
connection_pool (~> 2.1)
redis (~> 3.0)
redis (3.3.3)
reek (4.7.1)
reek (4.7.2)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.4.0.0, < 2.5)
rainbow (~> 2.0)
Expand Down Expand Up @@ -523,7 +525,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
savon (2.11.1)
savon (2.11.2)
akami (~> 1.2)
builder (>= 2.1.2)
gyoku (~> 1.2)
Expand All @@ -538,9 +540,9 @@ GEM
securecompare (1.0.0)
sexp_processor (4.8.0)
shellany (0.0.1)
shoulda-matchers (3.1.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
sidekiq (5.0.3)
sidekiq (5.0.4)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand Down Expand Up @@ -605,7 +607,7 @@ GEM
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.9.0)
timecop (0.9.1)
twilio-ruby (4.13.0)
builder (>= 2.1.2)
jwt (~> 1.0)
Expand Down Expand Up @@ -652,10 +654,10 @@ GEM
xmlmapper (~> 0.6)
xmlmapper (0.7.2)
nokogiri (~> 1.5)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)
zonebie (0.6.1)
zxcvbn-js (4.4.2)
zxcvbn-js (4.4.3)
Copy link
Copy Markdown
Contributor

@zachmargolis zachmargolis Aug 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we bump the node package version to keep these in sync?

Copy link
Copy Markdown
Contributor Author

@monfresh monfresh Aug 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes. Good catch.

Copy link
Copy Markdown
Contributor Author

@monfresh monfresh Aug 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it's not available yet?

No compatible version found: zxcvbn@^4.4.3

Should I revert the gem until the node package is available?

Copy link
Copy Markdown
Contributor Author

@monfresh monfresh Aug 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the Ruby gem's versioning does not necessarily correspond to the Dropbox versioning. It looks like he made a change to the Ruby code and updated the version number, so I think we're good to go here.
https://github.com/bitzesty/zxcvbn-js/commits/master

Copy link
Copy Markdown
Contributor

@zachmargolis zachmargolis Aug 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah as long as it's still compatible with our patch to swap out the underlying JS, it's probably fine

👍

execjs

PLATFORMS
Expand Down