stan

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

In Rails 3

NOTE: This post now lives (and kept up to date) on my blog: http://hakunin.com/rails3-load-paths

If you add a dir directly under app/

Do nothing. All files in this dir are eager loaded in production and lazy loaded in development by default.

	// layout file

	<body>
	<div class="container">

	<%= flash_messages %>

	<%= yield %>
	</div><!-- /container -->
	</body>

	require 'active_record'

	ActiveRecord::Base.establish_connection 'sqlite3:///:memory:'
	ActiveRecord::Base.connection.instance_eval do
	create_table :items
	create_table :events do \|t\|
	t.belongs_to :item
	end
	create_table :event_people do \|t\|
	t.belongs_to :event

	#!/bin/bash

	set -exo pipefail

	BUILD_ENV=$1
	if [ `uname` == 'Darwin' ]; then
	OSX=1
	JSCOMPRESSOR="yuicompressor --type js"
	else
	OSX=

	jQuery.fn.brightness = function() {
	var bg_color, rgba, y;
	bg_color = this.css('background-color');
	if ((bg_color != null) && bg_color.length) {
	rgba = bg_color.match(/^rgb(?:a)?\(([0-9]{1,3}),\s([0-9]{1,3}),\s([0-9]{1,3})(?:,\s)?([0-9]{1,3})?\)$/);
	if (rgba != null) {
	if (rgba[4] === '0') {
	if (this.parent().length) return this.parent().brightness();
	} else {
	y = 2.99 * rgba[1] + 5.87 * rgba[2] + 1.14 * rgba[3];

	begin
	class CreateModels < ActiveRecord::Migration
	def change
	create_table :items do \|t\|
	end

	create_table :events do \|t\|
	t.belongs_to :item
	end

	# to generate your dhparam.pem file, run in the terminal
	openssl dhparam -out /etc/nginx/ssl/dhparam.pem 2048

	sentence = "there is a wild rose"

	letters = sentence.gsub(' ','').split(//)

	# app / controllers / application_controller.rb
	class ApplicationController < ActionController::Base
	# Prevent CSRF attacks by raising an exception.
	# For APIs, you may want to use :null_session instead.
	protect_from_forgery with: :exception
	before_filter :configure_permitted_parameters, if: :devise_controller?

	protected

	def configure_permitted_parameters

stan

a simple git branching model (written in 2013)

In Rails 3

If you add a dir directly under app/

If you add a dir under app/something/