Gem source is https now.
Turn off mass assignment protection, turn on strong parameters.
Use strong params in TalksController.
Gem source is https now.
Update rails_admin to latest version supporting rails 3.x.
Update rails_admin to latest version supporting rails 3.x.
Declare Ruby version explicitly - - Cedar stack demands it or defaults to 2.0.0. Good practice.
bundle update rails - - On 3.1.2
Upgrade jquery-rails, rails_admin, and dependencies to match rails 3.2.17 upgrade
Update haml gem for namespacing issue introduced with rails 3.2.17 && dependencies upgrade
Remove explicit ruby version declaration - - for another day.
Merge pull request #54 from zkay/dev

Upgrade Rails => 3.2.17, rails_admin, misc dependencies.
Merge remote-tracking branch 'upstream/master' into upgrade-rails-admin

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #51 from phiggins/upgrade-rails-admin

Upgrade rails admin
Merge remote-tracking branch 'upstream/master' into fully-switch-to-strong-params

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #52 from phiggins/fully-switch-to-strong-params

Fully switch to strong params
Remove timestamps from affilations
Merge pull request #62 from seattlerb/fix-rails-3.2-timestamp-issue

Remove timestamps from affilations
Merge branch 'seattlerbmaster' into squash

* seattlerbmaster:
  Remove timestamps from affilations
  Remove explicit ruby version declaration - - for another day.
  Update haml gem for namespacing issue introduced with rails 3.2.17 && dependencies upgrade
  Upgrade jquery-rails, rails_admin, and dependencies to match rails 3.2.17 upgrade
  bundle update rails - - On 3.1.2
  Declare Ruby version explicitly - - Cedar stack demands it or defaults to 2.0.0. Good practice.
  Update rails_admin to latest version supporting rails 3.x.
  Update rails_admin to latest version supporting rails 3.x.
  Gem source is https now.
  Use strong params in TalksController.
  Turn off mass assignment protection, turn on strong parameters.
  Gem source is https now.

Conflicts:
	db/schema.rb