From b8cb983d502f3c801c8ff801cb44f51e0d2ded4c Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 18 Oct 2013 13:47:09 +0200 Subject: include Gemfile.lock to prevent unintended updates (#4174) We had a broken production server lately because it had upgraded the couchrest model dependency to one that had a different naming scheme for a function we overwrite. So that broke production. Let's prevent that by including the Gemfile.lock in our repositories. --- Gemfile.lock | 288 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 Gemfile.lock (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..8632805 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,288 @@ +GIT + remote: https://github.com/cchandler/certificate_authority.git + revision: 58161e4552cc1aeca846da3e25ed66721354ee11 + specs: + certificate_authority (0.2.0) + activemodel (>= 3.0.6) + +PATH + remote: billing + specs: + leap_web_billing (0.2.5) + braintree + leap_web_core (= 0.2.5) + +PATH + remote: certs + specs: + leap_web_certs (0.2.5) + certificate_authority (>= 0.2.0) + leap_web_core (= 0.2.5) + +PATH + remote: core + specs: + leap_web_core (0.2.5) + couchrest (~> 1.1.3) + couchrest_model (~> 2.0.0) + couchrest_session_store (~> 0.2.0) + json + rails (~> 3.2.11) + +PATH + remote: help + specs: + leap_web_help (0.2.5) + leap_web_core (= 0.2.5) + +PATH + remote: users + specs: + leap_web_users (0.2.5) + leap_web_core (= 0.2.5) + rails_warden + ruby-srp (~> 0.2.1) + +GEM + remote: https://rubygems.org/ + remote: http://rubygems.org/ + specs: + SyslogLogger (2.0) + actionmailer (3.2.15) + actionpack (= 3.2.15) + mail (~> 2.5.4) + actionpack (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.15) + activesupport (= 3.2.15) + builder (~> 3.0.0) + activerecord (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + activesupport (3.2.15) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + addressable (2.3.5) + arel (3.0.2) + bootstrap-sass (2.1.1.0) + bootswatch-rails (0.5.0) + railties (>= 3.1) + braintree (2.25.0) + builder (>= 2.0.0) + builder (3.0.4) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + client_side_validations (3.2.6) + client_side_validations-simple_form (2.1.0) + client_side_validations (~> 3.2.5) + simple_form (~> 2.1.0) + cliver (0.2.2) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.3) + columnize (0.3.6) + couchrest (1.1.3) + mime-types (~> 1.15) + multi_json (~> 1.0) + rest-client (~> 1.6.1) + couchrest_model (2.0.0) + activemodel (>= 3.0) + couchrest (~> 1.1.3) + mime-types (>= 1.15) + tzinfo (>= 0.3.22) + couchrest_session_store (0.2.0) + actionpack + couchrest + couchrest_model + daemons (1.1.9) + debugger (1.6.2) + columnize (>= 0.3.1) + debugger-linecache (~> 1.2.0) + debugger-ruby_core_source (~> 1.2.3) + debugger-linecache (1.2.0) + debugger-ruby_core_source (1.2.3) + erubis (2.7.0) + eventmachine (1.0.3) + execjs (2.0.2) + factory_girl (4.2.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.2.1) + factory_girl (~> 4.2.0) + railties (>= 3.0.0) + fake_braintree (0.4) + activesupport + braintree (~> 2.5) + capybara + i18n + sinatra + thin + faker (1.2.0) + i18n (~> 0.5) + haml (3.1.8) + haml-rails (0.3.5) + actionpack (>= 3.1, < 4.1) + activesupport (>= 3.1, < 4.1) + haml (~> 3.1) + railties (>= 3.1, < 4.1) + hike (1.2.3) + i18n (0.6.5) + journey (1.0.4) + jquery-rails (3.0.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) + kaminari (0.13.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + launchy (2.3.0) + addressable (~> 2.3) + libv8 (3.3.10.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.1) + mime-types (1.25) + mini_portile (0.5.1) + mocha (0.13.3) + metaclass (~> 0.0.1) + multi_json (1.8.2) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) + poltergeist (1.4.1) + capybara (~> 2.1.0) + cliver (~> 0.2.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.3) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-protection (1.5.0) + 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) + bundler (~> 1.0) + railties (= 3.2.15) + 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) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.0) + 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-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + simple_form (2.1.0) + actionpack (~> 3.0) + activemodel (~> 3.0) + sinatra (1.4.3) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + therubyracer (0.10.2) + libv8 (~> 3.3.10) + thin (1.5.1) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.38) + uglifier (1.2.7) + execjs (>= 0.3.0) + multi_json (~> 1.3) + warden (1.2.3) + rack (>= 1.0) + websocket-driver (0.3.0) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + SyslogLogger (~> 2.0) + bootstrap-sass (~> 2.1.0) + bootswatch-rails (~> 0.5.0) + capybara + certificate_authority! + client_side_validations + client_side_validations-simple_form + coffee-rails (~> 3.2.2) + debugger + factory_girl_rails + fake_braintree + faker + haml (~> 3.1.7) + haml-rails (~> 0.3.4) + jquery-rails + kaminari (= 0.13.0) + launchy + leap_web_billing! + leap_web_certs! + leap_web_core! + leap_web_help! + leap_web_users! + mocha (~> 0.13.0) + poltergeist + quiet_assets + rails-i18n + sass-rails (~> 3.2.5) + simple_form + therubyracer (~> 0.10.2) + thin + uglifier (~> 1.2.7) -- cgit v1.2.3 From 12f3d31e14fed756e909c8a656b00f92a9a62234 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 21 Oct 2013 11:51:36 +0200 Subject: remove duplicate source line that was using http I don't think we need to list the sources again in common_dependencies.rb --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 8632805..e6096fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,6 @@ PATH GEM remote: https://rubygems.org/ - remote: http://rubygems.org/ specs: SyslogLogger (2.0) actionmailer (3.2.15) -- cgit v1.2.3 From 7596b6dbfa38d52acd447982e03e26374fb0d747 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 21 Nov 2013 12:49:25 +0100 Subject: rake tasks clean up expired tokens and sessions (#4568) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index e6096fd..8d80546 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH leap_web_core (0.2.5) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.0) + couchrest_session_store (~> 0.2.1) json rails (~> 3.2.11) @@ -110,7 +110,7 @@ GEM couchrest (~> 1.1.3) mime-types (>= 1.15) tzinfo (>= 0.3.22) - couchrest_session_store (0.2.0) + couchrest_session_store (0.2.1) actionpack couchrest couchrest_model -- cgit v1.2.3 From d6cd73bca7b2e368d5c044a0bb473a89b88aaf2f Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 9 Dec 2013 19:58:20 +0100 Subject: update couchrest session store and Gemfile.lock This will fix the crash when loading the landing page without a couch connection. --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 8d80546..e0aba9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,38 +8,38 @@ GIT PATH remote: billing specs: - leap_web_billing (0.2.5) + leap_web_billing (0.2.8) braintree - leap_web_core (= 0.2.5) + leap_web_core (= 0.2.8) PATH remote: certs specs: - leap_web_certs (0.2.5) + leap_web_certs (0.2.8) certificate_authority (>= 0.2.0) - leap_web_core (= 0.2.5) + leap_web_core (= 0.2.8) PATH remote: core specs: - leap_web_core (0.2.5) + leap_web_core (0.2.8) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.1) + couchrest_session_store (~> 0.2.2) json rails (~> 3.2.11) PATH remote: help specs: - leap_web_help (0.2.5) - leap_web_core (= 0.2.5) + leap_web_help (0.2.8) + leap_web_core (= 0.2.8) PATH remote: users specs: - leap_web_users (0.2.5) - leap_web_core (= 0.2.5) + leap_web_users (0.2.8) + leap_web_core (= 0.2.8) rails_warden ruby-srp (~> 0.2.1) @@ -110,7 +110,7 @@ GEM couchrest (~> 1.1.3) mime-types (>= 1.15) tzinfo (>= 0.3.22) - couchrest_session_store (0.2.1) + couchrest_session_store (0.2.2) actionpack couchrest couchrest_model -- cgit v1.2.3 From 0f429901318051f3d60050e4ca46e014e965b7d3 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 9 Dec 2013 20:28:20 +0100 Subject: update ruby_core_source so it works with latest ruby version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index e0aba9d..d1fd014 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,7 @@ GEM debugger-linecache (~> 1.2.0) debugger-ruby_core_source (~> 1.2.3) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.3) + debugger-ruby_core_source (1.2.4) erubis (2.7.0) eventmachine (1.0.3) execjs (2.0.2) -- cgit v1.2.3 From e3b48ee60194b58c98cded485df4d936c5a4779d Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 12 Dec 2013 10:13:50 +0100 Subject: use the latest couchrest_session_store This one does not use our own error class for connection issues anymore. We'll remove that class in the next commit. So let's not rely on it. --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index d1fd014..1c24bc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH leap_web_core (0.2.8) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.2) + couchrest_session_store (~> 0.2.3) json rails (~> 3.2.11) @@ -105,12 +105,12 @@ GEM mime-types (~> 1.15) multi_json (~> 1.0) rest-client (~> 1.6.1) - couchrest_model (2.0.0) + couchrest_model (2.0.1) activemodel (>= 3.0) couchrest (~> 1.1.3) mime-types (>= 1.15) tzinfo (>= 0.3.22) - couchrest_session_store (0.2.2) + couchrest_session_store (0.2.3) actionpack couchrest couchrest_model @@ -145,7 +145,7 @@ GEM haml (~> 3.1) railties (>= 3.1, < 4.1) hike (1.2.3) - i18n (0.6.5) + i18n (0.6.9) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -162,7 +162,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.25) + mime-types (1.25.1) mini_portile (0.5.1) mocha (0.13.3) metaclass (~> 0.0.1) -- cgit v1.2.3 From 72087656e5092fd744f4314c9a0e91825399fefc Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 13 Dec 2013 11:16:11 +0100 Subject: proceed even if the couch is unreachable * in case the user has a session id, keep it but proceed without a session * in case we can't initialize the models proceed * if APP_CONFIG[:reraise_errors] is set we'll crash instead in the latter case default to reraise errors in dev and test environments. --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 1c24bc6..918fdba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH leap_web_core (0.2.8) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.3) + couchrest_session_store (~> 0.2.4) json rails (~> 3.2.11) @@ -110,7 +110,7 @@ GEM couchrest (~> 1.1.3) mime-types (>= 1.15) tzinfo (>= 0.3.22) - couchrest_session_store (0.2.3) + couchrest_session_store (0.2.4) actionpack couchrest couchrest_model -- cgit v1.2.3