summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-04 16:28:58 +0100
committerAzul <azul@leap.se>2012-11-04 16:28:58 +0100
commitcf1e7ee20f713068cadf5cfa78840115e0a8a081 (patch)
treec3d5feccccf4d6651ecb44e84a16a82b3cf7b287
parent5c6395d8b1a8c7cf540dae9fdd37f3e68554215c (diff)
using ruby-srp 0.1.4 - ruby 1.9.3 compatible
-rw-r--r--Gemfile.lock12
m---------users/app/assets/javascripts/srp0
-rw-r--r--users/leap_web_users.gemspec2
3 files changed, 11 insertions, 3 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
-Subproject 23350b54ec2723e1b2e333626567c9fe9d1e264
+Subproject d6a78049f3356d9d645143362eca74434410bf6
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