Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Jul 2, 2009

• Fixed overwriting of config options on rake tasks [Lighthouse 1270]

  ojak

  committed
  13c6fac

  Copy full SHA for 13c6fac

Commits on Jun 28, 2009

• [merb_datamapper] Fixed session configuration.

  Show description for a6a861d
  protocarl

  committed
  a6a861d

  Copy full SHA for a6a861d

Commits on Jun 17, 2009

• [merb_datamapper] actionorm compliance without explicit driver

  Show description for c4a5949
  snusnu

  committed
  c4a5949

  Copy full SHA for c4a5949

• [merb_datamapper] require dm-core and dm-migrations >= 0.10.0

  snusnu

  committed
  b4bcca0

  Copy full SHA for b4bcca0

• [merb_datamapper] fixed typo in rake task debug message

  snusnu

  committed
  b06d4ed

  Copy full SHA for b06d4ed

• Revert "[merb-actionorm] added datamapper driver"

  Show description for 1539a26
  snusnu

  committed
  1539a26

  Copy full SHA for 1539a26

• Revert "[merb_datamapper] explicitly use the datamapper actionorm driver"

  Show description for 578da11
  snusnu

  committed
  578da11

  Copy full SHA for 578da11

Commits on Jun 16, 2009

• merged wycats/master

  snusnu

  committed
  af41d5b

  Copy full SHA for af41d5b

Commits on Jun 4, 2009

• [merb_datamapper] explicitly use the datamapper actionorm driver

  snusnu

  committed
  21e67b0

  Copy full SHA for 21e67b0

• [merb_datamapper] hopefully caught the last deprecation warnings

  snusnu

  committed
  de7967e

  Copy full SHA for de7967e

Commits on Jun 3, 2009

• [merb_datamapper] updated resource_controller template to use 0.10.0 api

  snusnu

  committed
  1ee5456

  Copy full SHA for 1ee5456

• require dm-core-0.10.0

  snusnu

  committed
  d4dce57

  Copy full SHA for d4dce57

• merb_datamapper depends on merb-actionorm

  snusnu

  committed
  15fa354

  Copy full SHA for 15fa354

• [merb-actionorm] added datamapper driver

  snusnu

  committed
  7f6236e

  Copy full SHA for 7f6236e

• [merb_datamapper] removed most probably dead code

  Show description for de57d2b
  snusnu

  committed
  de57d2b

  Copy full SHA for de57d2b

• [merb_datamapper] removed dm-timestamps override

  Show description for 9ee67be
  snusnu

  committed
  9ee67be

  Copy full SHA for 9ee67be

Commits on May 24, 2009

• rake db:automigrate now compatible with datamapper 0.10.0

  Show description for d4e6c70
  snusnu

  committed
  d4e6c70

  Copy full SHA for d4e6c70

Commits on Apr 27, 2009

• switched merb_datamapper to ActionORM and made sure all the specs were compliant

  mattetti

  committed
  ffff732

  Copy full SHA for ffff732

Commits on Apr 20, 2009

• fixed a bug in actionorm and started switching gems to use actionorm

  mattetti

  committed
  784ac7d

  Copy full SHA for 784ac7d

• fixed a rubygems 1.3.2 bug

  mattetti

  committed
  fe3d2b6

  Copy full SHA for fe3d2b6

• Merge branch 'master' of git@github.com:wycats/merb

  Show description for a5ee3a0
  mattetti

  committed
  a5ee3a0

  Copy full SHA for a5ee3a0

• updated the action-orm rakefile to work like the others

  mattetti

  committed
  41fed47

  Copy full SHA for 41fed47

• Merge branch 'action_orm'

  Show description for 98d7e47
  mattetti

  committed
  98d7e47

  Copy full SHA for 98d7e47

Commits on Apr 19, 2009

• Change Merb::Controller to respond to #call and return a Rack Array.

  Show description for b92e492
  wycats

  committed
  b92e492

  Copy full SHA for b92e492

• Adding additional specs for the throw :halt within controller actions (#1202)

  merbjedi

  committed
  3620707

  Copy full SHA for 3620707

Commits on Apr 18, 2009

• Fixing asset spec so its not dependent on hash key ordering

  merbjedi

  committed
  30df9ac

  Copy full SHA for 30df9ac

• Merge commit 'origin/master' into merbjedi

  merbjedi

  committed
  3812775

  Copy full SHA for 3812775

Commits on Apr 9, 2009

• Merge branch 'master' of git@github.com:wycats/merb

  wycats

  committed
  86adeb2

  Copy full SHA for 86adeb2

• Adds ERB bench

  wycats

  committed
  a1e786c

  Copy full SHA for a1e786c

Commits on Apr 1, 2009

• fixed some specs to run properly on ruby1.9

  mattetti

  committed
  f24a90a

  Copy full SHA for f24a90a

• removed obsolete private spec

  mattetti

  committed
  37ef779

  Copy full SHA for 37ef779

• action_orm, set merb version dependency

  mattetti

  committed
  7a029f0

  Copy full SHA for 7a029f0

Commits on Mar 30, 2009

• bumped DM version to 0.9.11

  mattetti

  committed
  7cb6019

  Copy full SHA for 7cb6019

Commits on Mar 25, 2009

• Fix Local IP Address regexp

  

  pusewicz

  authored and

  mattetti

  committed
  9a7a993

  Copy full SHA for 9a7a993

Commits on Mar 24, 2009

• another quick fix to support Model objects being Hashes. (couchdb for i.e)

  mattetti

  committed
  47aa1a8

  Copy full SHA for 47aa1a8

Pagination

Previous

Next