Merge pull request #454 from cantino/bump_gems

update gems
This commit is contained in:
Andrew Cantino 2014-08-19 20:44:50 -07:00
commit aa8ebe40fd
2 changed files with 50 additions and 47 deletions

View file

@ -11,7 +11,7 @@ gem 'bundler', '>= 1.5.0'
gem 'protected_attributes', '~>1.0.8'
gem 'rails' , '4.1.4'
gem 'rails' , '4.1.5'
case RUBY_PLATFORM
when /freebsd|netbsd|openbsd/

View file

@ -12,27 +12,27 @@ GEM
remote: https://rubygems.org/
specs:
ace-rails-ap (2.0.1)
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
actionmailer (4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionpack (4.1.5)
actionview (= 4.1.5)
activesupport (= 4.1.5)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.5)
activemodel (= 4.1.5)
activesupport (= 4.1.5)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.5)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -60,12 +60,12 @@ GEM
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.7.1)
cookiejar (0.3.2)
coveralls (0.7.0)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
@ -77,7 +77,7 @@ GEM
debug_inspector (0.0.2)
delayed_job (4.0.2)
activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.1)
delayed_job_active_record (4.0.2)
activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1)
delorean (2.1.0)
@ -154,7 +154,7 @@ GEM
httparty (0.13.1)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.9)
i18n (0.6.11)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@ -181,7 +181,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (5.3.5)
minitest (5.4.0)
mqtt (0.2.0)
multi_json (1.10.1)
multi_xml (0.5.5)
@ -189,7 +189,7 @@ GEM
mysql2 (0.3.16)
naught (1.0.0)
net-ftp-list (3.2.8)
nokogiri (1.6.2.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
@ -202,7 +202,7 @@ GEM
polyglot (0.3.5)
protected_attributes (1.0.8)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
@ -211,31 +211,34 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.1.5)
actionmailer (= 4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
activemodel (= 4.1.5)
activerecord (= 4.1.5)
activesupport (= 4.1.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.5)
sprockets-rails (~> 2.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (4.1.5)
actionpack (= 4.1.5)
activesupport (= 4.1.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rdoc (4.1.1)
json (~> 1.4)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
retriable (1.4.1)
rr (1.1.2)
rspec (2.99.0)
@ -244,7 +247,7 @@ GEM
rspec-mocks (~> 2.99.0)
rspec-collection_matchers (1.0.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.1)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.2)
@ -272,9 +275,9 @@ GEM
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
select2-rails (3.5.7)
select2-rails (3.5.9.1)
thor (~> 0.14)
shoulda-matchers (2.6.1)
shoulda-matchers (2.6.2)
activesupport (>= 3.0.0)
signet (0.5.1)
addressable (>= 2.2.3)
@ -283,13 +286,13 @@ GEM
multi_json (>= 1.0.0)
simple-rss (1.3.1)
simple_oauth (0.2.0)
simplecov (0.8.2)
simplecov (0.9.0)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slack-notifier (0.5.0)
slop (3.5.0)
slop (3.6.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
@ -308,11 +311,11 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tins (1.3.0)
tins (1.3.2)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
twilio-ruby (3.11.5)
twilio-ruby (3.11.6)
builder (>= 2.1.2)
jwt (>= 0.1.2)
multi_json (>= 1.3.0)
@ -329,9 +332,9 @@ GEM
simple_oauth (~> 0.2.0)
typhoeus (0.6.9)
ethon (>= 0.7.1)
tzinfo (1.2.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.1)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
@ -340,7 +343,7 @@ GEM
raindrops (~> 0.7)
uuid (2.3.7)
macaddr (~> 1.0)
uuidtools (2.1.4)
uuidtools (2.1.5)
vcr (2.9.2)
warden (1.2.3)
rack (>= 1.0)
@ -402,7 +405,7 @@ DEPENDENCIES
pry
quiet_assets
rack
rails (= 4.1.4)
rails (= 4.1.5)
rails_12factor
rr
rspec (~> 2.99)