Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 19, 2010

• Regenerated gemspec for version 0.1.2

  bkeepers

  committed
  ecd4b0b

• Version bump to 0.1.2

  saturnflyer

  committed
  a42743d

Commits on Jan 2, 2010

• Regenerated gemspec for version 0.1.1

  bkeepers

  committed
  e515b30

• Version bump to 0.1.1

  bkeepers

  committed
  fcd4945

• move rails init for gem

  bkeepers

  committed
  18b1c41

• Generate gemspec for 0.1.0

  bkeepers

  committed
  72294e7

• Added jeweler

  bkeepers

  committed
  c5a4de0

• Version bump to 0.0.0

  bkeepers

  committed
  3f5d686

Commits on Apr 24, 2009

• changed callbacks:

  Show description for 079099b
  

  jfcouture

  authored and

  bkeepers

  committed
  079099b

• added simple callback merged_with:

  Show description for 32f2fbc
  

  jfcouture

  authored and

  bkeepers

  committed
  32f2fbc

• add option to not destroy the duplicate record

  

  jfcouture

  authored and

  bkeepers

  committed
  07fa702

• wrap merge! in a transaction

  

  jfcouture

  authored and

  bkeepers

  committed
  1a9a556

• memoize the ignored associations

  

  jfcouture

  authored and

  bkeepers

  committed
  8eea93f

• test for single table inheritance

  

  jfcouture

  authored and

  bkeepers

  committed
  b404dd9

• When merging a model with a belongs_to, keep the relation on the model to keep, instead of overwriting

  

  jfcouture

  authored and

  bkeepers

  committed
  c9d3a35

Commits on Feb 5, 2009

• Ignore properly through associations

  

  Mourad Hammiche

  authored and

  bkeepers

  committed
  14da1c5

• Added a test case for merging join model

  

  Mourad Hammiche

  authored and

  bkeepers

  committed
  4ce09e5

Commits on Oct 9, 2008

• Small refactor of merge!

  danielmorrison

  committed
  d0cc887

• Fixing merge! so it actually works when called on an active record object.

  danielmorrison

  committed
  10f3b46

Commits on Aug 21, 2008

• added :keep option for explicitly specifying which record to keep

  bkeepers

  committed
  db70e58

• call #uniq on the records to remove duplicates

  bkeepers

  committed
  d298994

Commits on Aug 18, 2008

• added :skip_association option

  bkeepers

  committed
  dda61ef

Commits on Aug 17, 2008

• sort records by #id instead of #created_at

  bkeepers

  committed
  90c9612

• updated README

  bkeepers

  committed
  f8db6df

• remove unused files, updated README

  bkeepers

  committed
  60a78d6

• minimal version of plugin for merging active record models together

  bkeepers

  committed
  6902dab

• empty plugin

  bkeepers

  committed
  c7e9f6c