From cf1e7ee20f713068cadf5cfa78840115e0a8a081 Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 4 Nov 2012 16:28:58 +0100 Subject: using ruby-srp 0.1.4 - ruby 1.9.3 compatible --- Gemfile.lock | 12 ++++++++++-- users/app/assets/javascripts/srp | 2 +- users/leap_web_users.gemspec | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 86cb8e8..be3cebb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH specs: leap_web_users (0.1.0) leap_web_core (= 0.1.0) - ruby-srp (~> 0.1.3) + ruby-srp (~> 0.1.4) GEM remote: https://rubygems.org/ @@ -81,6 +81,13 @@ GEM couchrest_session_store (0.0.1) couchrest couchrest_model + debugger (1.2.1) + columnize (>= 0.3.1) + debugger-linecache (~> 1.1.1) + debugger-ruby_core_source (~> 1.1.4) + debugger-linecache (1.1.2) + debugger-ruby_core_source (>= 1.1.1) + debugger-ruby_core_source (1.1.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -143,7 +150,7 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-srp (0.1.3) + ruby-srp (0.1.4) sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) @@ -174,6 +181,7 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 2.1.0) coffee-rails (~> 3.2.2) + debugger haml (~> 3.1.7) haml-rails (~> 0.3.4) jquery-rails diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp index 23350b5..d6a7804 160000 --- a/users/app/assets/javascripts/srp +++ b/users/app/assets/javascripts/srp @@ -1 +1 @@ -Subproject commit 23350b54ec2723e1b2e333626567c9fe9d1e2644 +Subproject commit d6a78049f3356d9d645143362eca74434410bf62 diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec index 6d35f63..dec5a71 100644 --- a/users/leap_web_users.gemspec +++ b/users/leap_web_users.gemspec @@ -17,5 +17,5 @@ Gem::Specification.new do |s| s.add_dependency "leap_web_core", LeapWeb::VERSION - s.add_dependency "ruby-srp", "~> 0.1.3" + s.add_dependency "ruby-srp", "~> 0.1.4" end -- cgit v1.2.3 From e04dc9ab8b9f1aaaf75f327ef4fd0f7f4d755a12 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 6 Nov 2012 11:55:18 +0100 Subject: undo accidentally reverted srp-js and ruby 1.9 debugger in gemfile --- Gemfile.lock | 8 -------- users/app/assets/javascripts/srp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index be3cebb..6792476 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,13 +81,6 @@ GEM couchrest_session_store (0.0.1) couchrest couchrest_model - debugger (1.2.1) - columnize (>= 0.3.1) - debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.1.4) - debugger-linecache (1.1.2) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -181,7 +174,6 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 2.1.0) coffee-rails (~> 3.2.2) - debugger haml (~> 3.1.7) haml-rails (~> 0.3.4) jquery-rails diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp index d6a7804..3bf101b 160000 --- a/users/app/assets/javascripts/srp +++ b/users/app/assets/javascripts/srp @@ -1 +1 @@ -Subproject commit d6a78049f3356d9d645143362eca74434410bf62 +Subproject commit 3bf101bc1ef3b5a58fe2f1e2a2e7a681f6de6c09 -- cgit v1.2.3 From ca2e1b9f379ccba068ad0ebb852d855f1639cd3a Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 9 Nov 2012 15:07:16 +0100 Subject: merged srp master into json api branch --- users/app/assets/javascripts/srp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp index 3bf101b..efac662 160000 --- a/users/app/assets/javascripts/srp +++ b/users/app/assets/javascripts/srp @@ -1 +1 @@ -Subproject commit 3bf101bc1ef3b5a58fe2f1e2a2e7a681f6de6c09 +Subproject commit efac662cdf31bc4b61ffb97b8c398e22a86c364b -- cgit v1.2.3