Merge branch 'master' of github.com:theldoria/worte

theldoria · Mar 20, 2012 · c3246bc · c3246bc
2 parents 2cfb92b + 55ff36a
commit c3246bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '3.2.1'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 group :production do
-#   gem 'pg'
+   gem 'pg'
 end
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,12 +47,13 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.6.5)
-    mail (2.4.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.1.0)
+    pg (0.13.2-x86-mingw32)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -80,7 +81,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     sass (3.1.15)
-    sass-rails (3.2.4)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -106,6 +107,7 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 3.2.1)
   jquery-rails
+  pg
   rails (= 3.2.1)
   sass-rails (~> 3.2.3)
   sqlite3

diff --git a/app/assets/stylesheets/custom.css b/app/assets/stylesheets/custom.css
@@ -144,7 +144,6 @@ div.field, div.actions {
   margin-bottom: 10px;
 }
 
-# user/index.html.erb
 
 ul.users {
   margin-top: 1em;
@@ -154,7 +153,6 @@ ul.users {
   list-style: none;
 }
 
-# Microposts
 
 h1.micropost {
   margin-bottom: 0.3em;
@@ -211,7 +209,6 @@ form.new_micropost textarea {
   margin-bottom: 0;
 }
 
-# Error messages
 
 .field_with_errors {
   margin-top: 10px;