summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-12-22 01:56:26 -0800
committerelijah <elijah@riseup.net>2013-12-22 01:56:26 -0800
commit5bf1462140a7aa17ea815ccc5105ace6fa878d83 (patch)
treeed0c0e089b9fd8abd5caa65229bbcb1c7f8bf32f
parent741f82253d0c88ab68213f605f44f5f27dff3e55 (diff)
re-generated Gemfile.lock with the new versions of engine gems. as a side effect, it also upgraded rails to the the latest in the 3.2 series.
-rw-r--r--Gemfile.lock112
-rw-r--r--billing/leap_web_billing.gemspec2
2 files changed, 57 insertions, 57 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cd65c89..8047594 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,21 +8,21 @@ GIT
PATH
remote: billing
specs:
- leap_web_billing (0.2.8)
+ leap_web_billing (0.5.0.rc)
braintree
- leap_web_core (= 0.2.8)
+ leap_web_core (= 0.5.0.rc)
PATH
remote: certs
specs:
- leap_web_certs (0.2.8)
+ leap_web_certs (0.5.0.rc)
certificate_authority (>= 0.2.0)
- leap_web_core (= 0.2.8)
+ leap_web_core (= 0.5.0.rc)
PATH
remote: core
specs:
- leap_web_core (0.2.8)
+ leap_web_core (0.5.0.rc)
couchrest (~> 1.1.3)
couchrest_model (~> 2.0.0)
couchrest_session_store (~> 0.2.4)
@@ -32,14 +32,14 @@ PATH
PATH
remote: help
specs:
- leap_web_help (0.2.8)
- leap_web_core (= 0.2.8)
+ leap_web_help (0.5.0.rc)
+ leap_web_core (= 0.5.0.rc)
PATH
remote: users
specs:
- leap_web_users (0.2.8)
- leap_web_core (= 0.2.8)
+ leap_web_users (0.5.0.rc)
+ leap_web_core (= 0.5.0.rc)
rails_warden
ruby-srp (~> 0.2.1)
@@ -47,12 +47,12 @@ GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
- actionmailer (3.2.15)
- actionpack (= 3.2.15)
+ actionmailer (3.2.16)
+ actionpack (= 3.2.16)
mail (~> 2.5.4)
- actionpack (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ actionpack (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -60,29 +60,29 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.15)
- activesupport (= 3.2.15)
+ activemodel (3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
- activerecord (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ activerecord (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- activesupport (3.2.15)
+ activeresource (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
+ activesupport (3.2.16)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
- arel (3.0.2)
+ arel (3.0.3)
bootstrap-sass (2.1.1.0)
bootswatch-rails (0.5.0)
railties (>= 3.1)
- braintree (2.25.0)
+ braintree (2.27.1)
builder (>= 2.0.0)
builder (3.0.4)
- capybara (2.1.0)
+ capybara (2.2.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -92,7 +92,7 @@ GEM
client_side_validations-simple_form (2.1.0)
client_side_validations (~> 3.2.5)
simple_form (~> 2.1.0)
- cliver (0.2.2)
+ cliver (0.3.2)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -115,19 +115,19 @@ GEM
couchrest
couchrest_model
daemons (1.1.9)
- debugger (1.6.2)
+ debugger (1.6.3)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
- debugger-ruby_core_source (~> 1.2.3)
+ debugger-ruby_core_source (~> 1.2.4)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.4)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
- factory_girl (4.2.0)
+ factory_girl (4.3.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.2.1)
- factory_girl (~> 4.2.0)
+ factory_girl_rails (4.3.0)
+ factory_girl (~> 4.3.0)
railties (>= 3.0.0)
fake_braintree (0.4)
activesupport
@@ -156,7 +156,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
- launchy (2.3.0)
+ launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.3.10.4)
mail (2.5.4)
@@ -164,17 +164,17 @@ GEM
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.25.1)
- mini_portile (0.5.1)
+ mini_portile (0.5.2)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.8.2)
- nokogiri (1.6.0)
+ nokogiri (1.6.1)
mini_portile (~> 0.5.0)
phantomjs-binaries (1.9.2.3)
sys-uname (= 0.9.0)
- poltergeist (1.4.1)
- capybara (~> 2.1.0)
- cliver (~> 0.2.1)
+ poltergeist (1.5.0)
+ capybara (~> 2.1)
+ cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.3)
@@ -183,47 +183,47 @@ GEM
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-protection (1.5.0)
+ rack-protection (1.5.1)
rack
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.15)
- actionmailer (= 3.2.15)
- actionpack (= 3.2.15)
- activerecord (= 3.2.15)
- activeresource (= 3.2.15)
- activesupport (= 3.2.15)
+ rails (3.2.16)
+ actionmailer (= 3.2.16)
+ actionpack (= 3.2.16)
+ activerecord (= 3.2.16)
+ activeresource (= 3.2.16)
+ activesupport (= 3.2.16)
bundler (~> 1.0)
- railties (= 3.2.15)
+ railties (= 3.2.16)
rails-i18n (3.0.0)
i18n (~> 0.5)
rails (>= 3.0.0, < 4.0.0)
rails_warden (0.5.7)
warden (>= 1.0.0)
- railties (3.2.15)
- actionpack (= 3.2.15)
- activesupport (= 3.2.15)
+ railties (3.2.16)
+ actionpack (= 3.2.16)
+ activesupport (= 3.2.16)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.1.0)
+ rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-srp (0.2.1)
- sass (3.2.12)
+ sass (3.2.13)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- simple_form (2.1.0)
+ simple_form (2.1.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
- sinatra (1.4.3)
+ sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
@@ -236,9 +236,9 @@ GEM
ffi (>= 1.0.0)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
- thin (1.5.1)
+ thin (1.6.1)
daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
+ eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.1)
tilt (1.4.1)
@@ -251,7 +251,7 @@ GEM
multi_json (~> 1.3)
warden (1.2.3)
rack (>= 1.0)
- websocket-driver (0.3.0)
+ websocket-driver (0.3.1)
xpath (2.0.0)
nokogiri (~> 1.3)
diff --git a/billing/leap_web_billing.gemspec b/billing/leap_web_billing.gemspec
index 17f7f92..94d92e0 100644
--- a/billing/leap_web_billing.gemspec
+++ b/billing/leap_web_billing.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.summary = "Billing for LeapWeb"
s.description = "Billing System for a Leap provider"
- s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
+ s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md"]
s.test_files = Dir["test/**/*"]
s.add_dependency "leap_web_core", LeapWeb::VERSION