From 0c79df9874c59fbaa5c845e07d8fa1b4bbc23b9c Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 17:11:32 +0200 Subject: use ruby-srp 0.1.3 which returns the user on authenticate call Also removed a few hooks to User.current. Will replace with current_user --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index fe49476..f731561 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ PATH specs: leap_web_users (0.1.0) leap_web_core (= 0.1.0) - ruby-srp (~> 0.1.1) + ruby-srp (~> 0.1.3) GEM remote: https://rubygems.org/ @@ -137,7 +137,7 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-srp (0.1.1) + ruby-srp (0.1.3) sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) -- cgit v1.2.3 From dc0584f7d993ef7c75fbdd9d341ebb3337f3448d Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 17 Oct 2012 15:19:09 +0200 Subject: UI tweaks including newer version of bootstrap --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index f731561..a982c2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,7 +53,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - bootstrap-sass (2.0.4.2) + bootstrap-sass (2.1.0.0) builder (3.0.3) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -166,7 +166,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 2.0.4) + bootstrap-sass (~> 2.1.0) coffee-rails (~> 3.2.2) haml (~> 3.1.7) haml-rails (~> 0.3.4) -- cgit v1.2.3 From 171d07a64d3f76e68c22f0fb4cc3795daad806d1 Mon Sep 17 00:00:00 2001 From: jessib Date: Wed, 17 Oct 2012 10:04:34 -0700 Subject: Not sure we actually want this in version control, but adding changes so long as we have it. --- Gemfile.lock | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index fe49476..137e6d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,12 @@ PATH json rails (~> 3.2.8) +PATH + remote: help + specs: + leap_web_help (0.1.0) + leap_web_core (= 0.1.0) + PATH remote: users specs: @@ -173,6 +179,7 @@ DEPENDENCIES jquery-rails leap_web_certs! leap_web_core! + leap_web_help! leap_web_users! mocha ruby-debug -- cgit v1.2.3 From 194e924cb7c36eafa01b68c74774505e170e47ac Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 30 Oct 2012 12:32:10 +0100 Subject: adding in warden with a basic strategy currently failing because we are not setting the content-type header. --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index a982c2a..5b1fbf6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,6 +20,7 @@ PATH leap_web_users (0.1.0) leap_web_core (= 0.1.0) ruby-srp (~> 0.1.3) + warden GEM remote: https://rubygems.org/ @@ -161,6 +162,8 @@ GEM uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) + warden (1.2.1) + rack (>= 1.0) PLATFORMS ruby -- cgit v1.2.3 From bcc0f11caeef1b09712b9b62e1607237885d1af5 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 30 Oct 2012 14:42:04 +0100 Subject: using rails_warden bit of refactoring without rails_warden the failure app action was not getting set properly. --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 5b1fbf6..a9ca432 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,8 +19,8 @@ PATH specs: leap_web_users (0.1.0) leap_web_core (= 0.1.0) + rails_warden ruby-srp (~> 0.1.3) - warden GEM remote: https://rubygems.org/ @@ -120,6 +120,8 @@ GEM activesupport (= 3.2.8) bundler (~> 1.0) railties (= 3.2.8) + rails_warden (0.5.7) + warden (>= 1.0.0) railties (3.2.8) actionpack (= 3.2.8) activesupport (= 3.2.8) -- cgit v1.2.3 From 19008253d01fd6d7a864e98a7ae5dc216070aee1 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 86cb8e8..6792476 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/ @@ -143,7 +143,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) -- cgit v1.2.3 From fe8b49232d31681667badaaeff7aa4d0a40445ea Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 12 Nov 2012 19:22:27 +0100 Subject: don't track Gemfile.lock --- Gemfile.lock | 194 ----------------------------------------------------------- 1 file changed, 194 deletions(-) delete mode 100644 Gemfile.lock (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 01a2291..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,194 +0,0 @@ -PATH - remote: certs - specs: - leap_web_certs (0.1.0) - leap_web_core (= 0.1.0) - -PATH - remote: core - specs: - leap_web_core (0.1.0) - couchrest (~> 1.1.3) - couchrest_model (~> 2.0.0.beta2) - couchrest_session_store (~> 0.0.1) - json - rails (~> 3.2.8) - -PATH - remote: help - specs: - leap_web_help (0.1.0) - leap_web_core (= 0.1.0) - -PATH - remote: users - specs: - leap_web_users (0.1.0) - leap_web_core (= 0.1.0) - rails_warden - ruby-srp (~> 0.1.4) - -GEM - remote: https://rubygems.org/ - remote: http://rubygems.org/ - specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) - mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) - builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) - bootstrap-sass (2.1.0.0) - builder (3.0.3) - 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.3.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.beta2) - activemodel (~> 3.0) - couchrest (~> 1.1.3) - mime-types (~> 1.15) - tzinfo (~> 0.3.22) - couchrest_session_store (0.0.1) - couchrest - couchrest_model - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - haml (3.1.7) - 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.1) - i18n (0.6.1) - journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.5) - libv8 (3.3.10.4) - linecache (0.46) - rbx-require-relative (> 0.0.4) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.1) - mime-types (1.19) - mocha (0.12.6) - metaclass (~> 0.0.1) - multi_json (1.3.6) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.2) - rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) - bundler (~> 1.0) - railties (= 3.2.8) - rails_warden (0.5.7) - warden (>= 1.0.0) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rbx-require-relative (0.0.9) - rdoc (3.12) - json (~> 1.4) - rest-client (1.6.7) - mime-types (>= 1.16) - ruby-debug (0.10.4) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.4.0) - ruby-debug-base (0.10.4) - linecache (>= 0.3) - ruby-srp (0.1.4) - sass (3.2.1) - sass-rails (3.2.5) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - simple_form (2.0.4) - actionpack (~> 3.0) - activemodel (~> 3.0) - sprockets (2.1.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - therubyracer (0.10.2) - libv8 (~> 3.3.10) - thor (0.16.0) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.7) - execjs (>= 0.3.0) - multi_json (~> 1.3) - warden (1.2.1) - rack (>= 1.0) - -PLATFORMS - ruby - -DEPENDENCIES - bootstrap-sass (~> 2.1.0) - coffee-rails (~> 3.2.2) - haml (~> 3.1.7) - haml-rails (~> 0.3.4) - jquery-rails - leap_web_certs! - leap_web_core! - leap_web_help! - leap_web_users! - mocha - ruby-debug - sass-rails (~> 3.2.5) - simple_form - therubyracer - uglifier (~> 1.2.7) -- cgit v1.2.3