*.pbxproj -crlf -diff -merge

class Tag < ActiveRecord::Base
  translates :name, :slug
  # load our code explicitly to make sure it gets loaded in development mode

require 'rubygems'
script_console_running = ENV.include?('RAILS_ENV') && IRB.conf[:LOAD_MODULES] && IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
 

User.paginate(:page => params[:page], :per_page => 10,:select => "name, id").map{|user| [user.name, user.id]}

SELECT * FROM "users"

User.all.map{|user| [user.name, user.id] }

friends.accepted.map{ |friend| friend.logs.visible_for(self) }.flatten

@user.friends.sort_by { |friend| [ friend.online? ? 1 : 0,friend] }

@user.friends.map {|friend| friend.id}

RewriteEngine On
RewriteCond %{REQUEST_URI} (css|js|jpe?g|png|gif|ico)$ [NC]
RewriteCond %{QUERY_STRING} ^[0-9]+$

HTTP/1.1 200 OK
Date: Sat, 18 Jul 2009 11:58:42 GMT
Server: Apache/2.2.11 (Unix) mod_ssl/2.2.11 OpenSSL/0.9.7l DAV/2 Phusion_Passenger/2.2.2

curl --head http://cootweet_p.local/images/camera.png?1246970549

<directory "/Users/joe/work/cootweet/public">  
Options -Indexes
        Order allow,deny

gzip                on;
gzip_http_version   1.0;
gzip_comp_level     2;

ExpiresActive on
<FilesMatch "\.(js|css|gif|png|jpg)$">
   ExpiresDefault "access plus 2 year"

server {
    listen       80;
    server_name  localhost;

#user  nobody;
worker_processes  1;
 

<VirtualHost *:80>
  ServerName cootweet_p.local
  DocumentRoot "/Users/joe/work/cootweet/public"

module Sass::Script
  module Functions
    # substitue text in a string

  def save_profile
    unless params[:user].blank?
      if params[:user][:uploaded_picture].blank?