Skip to content

Commit

Permalink
4/10/12 test commit on new OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Cleveland authored and Chris Cleveland committed Apr 10, 2012
1 parent e197a34 commit 8cc4b08
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 56 deletions.
108 changes: 54 additions & 54 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
GIT
remote: git://github.com/rails/rails.git
revision: 3cd33ea612748b5e9c38e20349b30382aec2fbc9
revision: 8c3ca29d45c7608047d7f2db524893756a60a1cb
branch: 3-1-stable
specs:
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
actionpack (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
actionmailer (3.1.4)
actionpack (= 3.1.4)
mail (~> 2.3.3)
actionpack (3.1.4)
activemodel (= 3.1.4)
activesupport (= 3.1.4)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.5)
rack-cache (~> 1.1)
rack (~> 1.3.6)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.2)
activemodel (3.1.1)
activesupport (= 3.1.1)
sprockets (~> 2.0.3)
activemodel (3.1.4)
activesupport (= 3.1.4)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
arel (~> 2.2.1)
activerecord (3.1.4)
activemodel (= 3.1.4)
activesupport (= 3.1.4)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
activeresource (3.1.1)
activemodel (= 3.1.1)
activesupport (= 3.1.1)
activesupport (3.1.1)
activeresource (3.1.4)
activemodel (= 3.1.4)
activesupport (= 3.1.4)
activesupport (3.1.4)
multi_json (~> 1.0)
rails (3.1.1)
actionmailer (= 3.1.1)
actionpack (= 3.1.1)
activerecord (= 3.1.1)
activeresource (= 3.1.1)
activesupport (= 3.1.1)
rails (3.1.4)
actionmailer (= 3.1.4)
actionpack (= 3.1.4)
activerecord (= 3.1.4)
activeresource (= 3.1.4)
activesupport (= 3.1.4)
bundler (~> 1.0)
railties (= 3.1.1)
railties (3.1.1)
actionpack (= 3.1.1)
activesupport (= 3.1.1)
railties (= 3.1.4)
railties (3.1.4)
actionpack (= 3.1.4)
activesupport (= 3.1.4)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -51,23 +51,23 @@ GEM
remote: http://rubygems.org/
specs:
annotate (2.4.0)
arel (2.2.1)
arel (2.2.3)
aws-s3 (0.6.2)
builder
mime-types
xml-simple
builder (3.0.0)
cocaine (0.2.0)
cocaine (0.2.1)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
coffee-script-source (1.3.0)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.2.9)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (1.3.3)
factory_girl_rails (1.0)
Expand All @@ -77,26 +77,27 @@ GEM
gravatar_image_tag (1.0.0.pre2)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.16)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
mail (2.3.0)
json (1.6.6)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.0.3)
nokogiri (1.5.0)
paperclip (2.4.5)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
mime-types (1.18)
multi_json (1.2.0)
nokogiri (1.5.2)
paperclip (3.0.1)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (>= 0.0.2)
mime-types
pg (0.11.0)
pg (0.13.2)
polyglot (0.3.3)
rack (1.3.5)
rack-cache (1.1)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
Expand All @@ -105,7 +106,7 @@ GEM
rack-test (0.6.1)
rack (>= 1.0)
rake (0.8.7)
rdoc (3.11)
rdoc (3.12)
json (~> 1.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
Expand All @@ -120,27 +121,26 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
sass (3.1.10)
sass-rails (3.1.4)
sass (3.1.15)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.4)
sprockets (~> 2.0.0)
sass (>= 3.1.10)
tilt (~> 1.3.2)
spork (0.9.0.rc5)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
sqlite3 (1.3.5)
therubyracer-heroku (0.8.1.pre3)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.30)
uglifier (1.0.4)
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
webrat (0.7.1)
Expand Down
3 changes: 1 addition & 2 deletions app/views/history_females/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

<div id="update_history_1" class="">
<h2><span class="icon"></span>Fill out patient information</h2>




<table>
<tr class="odd"><td>Name:</td><td><%= f.text_field :name %></td></tr>
Expand Down

0 comments on commit 8cc4b08

Please sign in to comment.