From ad72a77e67aefad14f829e6b2130667c1528bed4 Mon Sep 17 00:00:00 2001 From: Bortseb Date: Thu, 7 Mar 2013 22:38:03 -0500 Subject: [PATCH 1/2] Added Robert and Naomi users to fixtures --- test/fixtures/users.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 63179cb8..c3b2c1a7 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -23,3 +23,19 @@ ishan: crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 persistence_token: perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc + +robert: + name: Robert Best + email: chessscholar@gmail.com + password_salt: i9vWzlSSPA3uIaer5jk + crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 + persistence_token: + perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc + +naomi: + name: Naomi Hemsley + email: naomihemsley@gmail.com + password_salt: i9vWzlSSPA3uIaer5jk + crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 + persistence_token: + perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc \ No newline at end of file From 18da6d6ff2701dfef72cac4eb99e859ef76a8f39 Mon Sep 17 00:00:00 2001 From: Naomi Hemsley Date: Thu, 7 Mar 2013 23:41:45 -0500 Subject: [PATCH 2/2] nothing to commit --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index cc33f0b6..ed4f0c01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,7 @@ GEM railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.6) + libv8 (3.11.8.13) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -94,8 +95,10 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) + rb-readline (0.4.2) rdoc (3.12) json (~> 1.4) + ref (1.0.2) sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) @@ -106,6 +109,9 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + therubyracer (0.11.4) + libv8 (~> 3.11.8.12) + ref thor (0.16.0) tilt (1.3.3) treetop (1.4.12) @@ -133,5 +139,7 @@ DEPENDENCIES pg rails (= 3.2.11) rails3-jquery-autocomplete + rb-readline sass-rails (~> 3.2.3) + therubyracer uglifier (>= 1.0.3)