build using rails_apps_composer 2.2.10

DanielKehoe · DanielKehoe · commit 3952918294da · 2012-10-01T11:00:59.000-07:00
diff --git a/Gemfile b/Gemfile
@@ -13,5 +13,5 @@ gem "email_spec", ">= 1.2.1", :group => :test
 gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
 gem "database_cleaner", ">= 0.8.0", :group => :test
 gem "launchy", ">= 2.1.2", :group => :test
-gem "factory_girl_rails", ">= 4.0.0", :group => [:development, :test]
+gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
 gem "devise", ">= 2.1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
     addressable (2.3.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    builder (3.0.2)
+    builder (3.0.3)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -70,18 +70,18 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.0.0)
-      factory_girl (~> 4.0.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
       railties (>= 3.0.0)
     ffi (1.1.5)
     gherkin (2.11.2)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.2)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -103,7 +103,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -130,7 +130,7 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
     rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -176,7 +176,7 @@ DEPENDENCIES
   database_cleaner (>= 0.8.0)
   devise (>= 2.1.2)
   email_spec (>= 1.2.1)
-  factory_girl_rails (>= 4.0.0)
+  factory_girl_rails (>= 4.1.0)
   jquery-rails
   launchy (>= 2.1.2)
   rails (= 3.2.8)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,14 +1,13 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Rails3 Devise Rspec Cucumber</title>
-    <meta name="description" content=""/>
-    <meta name="author" content=""/>
-    <%= stylesheet_link_tag    "application", :media => "all" %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= content_for?(:title) ? yield(:title) : "Rails3 Devise Rspec Cucumber" %></title>
+    <meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Rails3 Devise Rspec Cucumber" %>">
+    <%= stylesheet_link_tag "application", :media => "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
+    <%= yield(:head) %>
   </head>
   <body>
     <div id="container" class="container">
