Skip to content
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.

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

Bump rake from 10.5.0 to 13.0.1 #7

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem 'inherited_resources', '~> 1.6.0'
gem 'compass', '~> 0.13.alpha'

gem 'mysql2', '~> 0.3.0'
gem 'rake', '~> 10.5.0'
gem 'rake', '~> 13.0.1'
gem 'therubyracer', :require => 'v8'
gem 'haml'
gem 'will_paginate'
Expand Down
84 changes: 42 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ GEM
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4)
browser (0.8.0)
builder (3.2.2)
builder (3.2.4)
cancancan (1.13.1)
capybara (2.4.1)
mime-types (>= 1.16)
Expand All @@ -118,33 +118,34 @@ GEM
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
chef (12.0.3)
chef-zero (~> 3.2)
chef (11.18.12)
chef-zero (~> 2.2, >= 2.2.1)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 1.2)
highline (~> 1.6, >= 1.6.9)
mime-types (~> 1.16)
mixlib-authentication (~> 1.3)
mixlib-cli (~> 1.4)
mixlib-config (~> 2.0)
mixlib-log (~> 1.3)
mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
mixlib-shellout (~> 1.4)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1)
ohai (~> 8.0)
ohai (~> 7.4)
plist (~> 3.1.0)
pry (~> 0.9)
chef-zero (3.2.1)
rest-client (>= 1.0.4, <= 1.6.7)
chef-zero (2.2.1)
ffi-yajl (~> 1.1)
hashie (~> 2.0)
mixlib-log (~> 1.3)
rack
uuidtools (~> 2.1)
chronic (0.10.2)
chunky_png (1.3.1)
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.0)
coderay (1.1.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
Expand All @@ -159,6 +160,7 @@ GEM
sass (~> 3.2.5)
compass-rails (2.0.0)
compass (>= 0.12.2)
concurrent-ruby (1.1.6)
configatron (2.13.0)
yamler (>= 0.1.0)
crack (0.4.2)
Expand All @@ -179,7 +181,7 @@ GEM
devise (~> 3.2)
devise-encryptable (0.2.0)
devise (>= 2.1.0)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
dotiw (2.0)
actionpack (>= 3)
Expand All @@ -198,8 +200,8 @@ GEM
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
fastercsv (1.5.5)
ffi (1.9.6)
ffi-yajl (1.3.1)
ffi (1.12.2)
ffi-yajl (1.4.0)
ffi (~> 1.5)
libyajl2 (~> 1.2)
filesize (0.1.1)
Expand Down Expand Up @@ -233,7 +235,8 @@ GEM
httpi (2.4.2)
rack
socksify
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-js (3.0.0.rc12)
i18n (~> 0.6, >= 0.6.6)
icalendar (2.1.1)
Expand All @@ -242,11 +245,11 @@ GEM
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
ipaddress (0.8.0)
ipaddress (0.8.3)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (1.8.6)
launchy (2.4.2)
addressable (~> 2.3)
leaflet-rails (0.7.4)
Expand Down Expand Up @@ -280,47 +283,44 @@ GEM
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
method_source (0.8.2)
method_source (0.9.2)
mime-types (1.25.1)
mini_magick (3.8.1)
subexec (~> 0.2.1)
mini_portile2 (2.0.0)
minitar (0.5.4)
minitest (5.8.4)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.5.0)
mixlib-config (2.1.0)
mixlib-log (1.6.0)
mixlib-shellout (2.0.1)
minitest (5.14.0)
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.18)
tomlrb
mixlib-log (1.7.1)
mixlib-shellout (1.6.1)
momentjs-rails (2.8.3)
railties (>= 3.1)
mono_logger (1.1.0)
multi_json (1.12.0)
multi_xml (0.5.5)
mysql2 (0.3.21)
net-dhcp (1.3.2)
net-ldap (0.6.1)
net-ssh (2.9.3.beta1)
net-ssh-gateway (1.2.0)
net-ssh (2.9.4)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.0)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nori (2.6.0)
ohai (8.0.1)
ohai (7.4.1)
ffi (~> 1.9)
ffi-yajl (~> 1.1)
ipaddress
mime-types (~> 1.16)
mixlib-cli
mixlib-config (~> 2.0)
mixlib-log
mixlib-shellout (~> 2.0)
net-dhcp
rake (~> 10.1)
mixlib-shellout (~> 1.2)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
orm_adapter (0.5.0)
Expand All @@ -334,10 +334,9 @@ GEM
premailer (~> 1.7, >= 1.7.9)
prism (0.1.0)
nokogiri
pry (0.10.1)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
method_source (~> 0.9.0)
public_activity (1.5.0)
actionpack (>= 3.0.0)
activerecord (>= 3.0)
Expand Down Expand Up @@ -371,7 +370,7 @@ GEM
activesupport (= 4.1.14.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rake (13.0.1)
recaptcha (3.3.0)
json
redcarpet (3.3.2)
Expand Down Expand Up @@ -401,6 +400,8 @@ GEM
rspec-core (>= 2.5.0)
rspec-expectations (>= 2.5.0)
rspec-mocks (>= 2.5.0)
rest-client (1.6.7)
mime-types (>= 1.16)
rmagick (2.16.0)
rspec-collection_matchers (1.0.0)
rspec-expectations (>= 2.99.0.beta1)
Expand Down Expand Up @@ -467,7 +468,6 @@ GEM
slim (2.1.0)
temple (~> 0.6.9)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
socksify (1.7.0)
spring (1.3.4)
sprockets (2.12.4)
Expand All @@ -481,7 +481,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
subexec (0.2.3)
systemu (2.6.4)
systemu (2.6.5)
temple (0.6.9)
terminal-table (1.4.5)
therubyracer (0.12.1)
Expand All @@ -491,22 +491,22 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.0)
tomlrb (1.2.9)
turn (0.8.2)
ansi (>= 1.2.2)
twitter-bootstrap-rails (2.2.8)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
tzinfo (1.2.2)
tzinfo (1.2.6)
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
uuidtools (2.1.5)
valid_email (0.0.11)
activemodel
mail (~> 2.6.1)
Expand All @@ -526,7 +526,7 @@ GEM
rack (>= 1.0)
rack-test (>= 0.5.3)
will_paginate (3.0.7)
wmi-lite (1.0.0)
wmi-lite (1.0.5)
xml-simple (1.1.5)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand Down Expand Up @@ -612,7 +612,7 @@ DEPENDENCIES
rails (~> 4.1.14.2)
rails-footnotes
rails_autolink (~> 1.1.0)
rake (~> 10.5.0)
rake (~> 13.0.1)
recaptcha
redcarpet
resque (~> 1.25.2)
Expand Down