summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-05-16 08:42:36 +0200
committerAzul <azul@leap.se>2014-05-16 08:42:36 +0200
commit8fbbb8717f0578536b97c2dc0883c632f120e976 (patch)
tree17aeb2b48ada703ac916a9a65fbf3c75a5dadb86 /Gemfile.lock
parent81555ec6244ed76f92e3629880f68104b8705817 (diff)
parenta4f7a410c536d88c91c834cab6ee950c71005ddd (diff)
Merge remote-tracking branch 'origin/develop'
Conflicts: app/assets/javascripts/srp test/nagios/soledad_sync.py test/nagios/webapp_login.py
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock109
1 files changed, 43 insertions, 66 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c7486f..67c04de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,53 +6,26 @@ GIT
activemodel (>= 3.0.6)
PATH
- remote: billing
+ remote: engines/billing
specs:
leap_web_billing (0.5.0)
braintree
- leap_web_core (= 0.5.0)
PATH
- remote: certs
- specs:
- leap_web_certs (0.5.0)
- certificate_authority (>= 0.2.0)
- leap_web_core (= 0.5.0)
-
-PATH
- remote: core
- specs:
- leap_web_core (0.5.0)
- couchrest (~> 1.1.3)
- couchrest_model (~> 2.0.0)
- couchrest_session_store (~> 0.2.4)
- json
- rails (~> 3.2.11)
-
-PATH
- remote: help
+ remote: engines/support
specs:
leap_web_help (0.5.0)
- leap_web_core (= 0.5.0)
-
-PATH
- remote: users
- specs:
- leap_web_users (0.5.0)
- leap_web_core (= 0.5.0)
- rails_warden
- ruby-srp (~> 0.2.1)
GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
- actionmailer (3.2.16)
- actionpack (= 3.2.16)
+ actionmailer (3.2.18)
+ actionpack (= 3.2.18)
mail (~> 2.5.4)
- actionpack (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ actionpack (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -60,18 +33,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.16)
- activesupport (= 3.2.16)
+ activemodel (3.2.18)
+ activesupport (= 3.2.18)
builder (~> 3.0.0)
- activerecord (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ activerecord (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
- activesupport (3.2.16)
+ activeresource (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
+ activesupport (3.2.18)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
@@ -101,7 +74,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
- columnize (0.3.6)
+ columnize (0.8.9)
couchrest (1.1.3)
mime-types (~> 1.15)
multi_json (~> 1.0)
@@ -116,12 +89,12 @@ GEM
couchrest
couchrest_model
daemons (1.1.9)
- debugger (1.6.3)
+ debugger (1.6.6)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
- debugger-ruby_core_source (~> 1.2.4)
+ debugger-ruby_core_source (~> 1.3.2)
debugger-linecache (1.2.0)
- debugger-ruby_core_source (1.2.4)
+ debugger-ruby_core_source (1.3.2)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
@@ -170,7 +143,7 @@ GEM
minitest-stub-const (0.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.8.2)
+ multi_json (1.10.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
phantomjs-binaries (1.9.2.3)
@@ -180,7 +153,7 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- polyglot (0.3.3)
+ polyglot (0.3.4)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.4.5)
@@ -188,31 +161,31 @@ GEM
rack (>= 0.4)
rack-protection (1.5.1)
rack
- rack-ssl (1.3.3)
+ rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.16)
- actionmailer (= 3.2.16)
- actionpack (= 3.2.16)
- activerecord (= 3.2.16)
- activeresource (= 3.2.16)
- activesupport (= 3.2.16)
+ rails (3.2.18)
+ actionmailer (= 3.2.18)
+ actionpack (= 3.2.18)
+ activerecord (= 3.2.18)
+ activeresource (= 3.2.18)
+ activesupport (= 3.2.18)
bundler (~> 1.0)
- railties (= 3.2.16)
+ railties (= 3.2.18)
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.16)
- actionpack (= 3.2.16)
- activesupport (= 3.2.16)
+ railties (3.2.18)
+ actionpack (= 3.2.18)
+ activesupport (= 3.2.18)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.1.1)
+ rake (10.3.1)
rdiscount (2.0.7)
rdoc (3.12.2)
json (~> 1.4)
@@ -244,12 +217,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
- thor (0.18.1)
+ thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.38)
+ tzinfo (0.3.39)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -271,6 +244,9 @@ DEPENDENCIES
client_side_validations
client_side_validations-simple_form
coffee-rails (~> 3.2.2)
+ couchrest (~> 1.1.3)
+ couchrest_model (~> 2.0.0)
+ couchrest_session_store (~> 0.2.4)
debugger
factory_girl_rails
fake_braintree
@@ -279,20 +255,21 @@ DEPENDENCIES
haml-rails (~> 0.3.4)
http_accept_language
jquery-rails
+ json
kaminari (= 0.13.0)
launchy
leap_web_billing!
- leap_web_certs!
- leap_web_core!
leap_web_help!
- leap_web_users!
minitest-stub-const
mocha (~> 0.13.0)
phantomjs-binaries
poltergeist
quiet_assets
+ rails (~> 3.2.18)
rails-i18n
+ rails_warden
rdiscount
+ ruby-srp (~> 0.2.1)
sass-rails (~> 3.2.5)
simple_form
therubyracer (~> 0.10.2)