Code

1.0.x#8

Code

Open

icyou2014 wants to merge 55 commits intomasterwycats/merb:masterfrom 1.0.xwycats/merb:1.0.xCopy head branch name to clipboard

+427-185

Commits

Commits on Feb 10, 2009

• [merb_datamapper]Removed a temp monkey patch to fix an issue with DM::Timestamps.

  Show description for 133111d
  mattetti

  committed
  133111d

  Copy full SHA for 133111d

Commits on Mar 18, 2009

• Poll for memory every 30 seconds instead of every 1/4 second

  wycats

  committed
  fa06c14

  Copy full SHA for fa06c14

• Update merb_datamapper to use DataMapper.repository instead of Kernel#repository

  wycats

  committed
  0af606e

  Copy full SHA for 0af606e

• Bump version

  wycats

  committed
  476d30b

  Copy full SHA for 476d30b

Commits on Mar 23, 2009

• Yikes! Variable name fail

  wycats

  committed
  a690ec0

  Copy full SHA for a690ec0

Commits on Mar 31, 2009

• bumped DM version to 0.9.11

  mattetti

  committed
  ca8ccfb

  Copy full SHA for ca8ccfb

• Fix Local IP Address regexp

  

  pusewicz

  authored and

  mattetti

  committed
  fa9c894

  Copy full SHA for fa9c894

• improved route generation support for couchdb ORMs using hash objects.

  mattetti

  committed
  09efad0

  Copy full SHA for 09efad0

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

  mattetti

  committed
  1b9f210

  Copy full SHA for 1b9f210

• removed obsolete private spec

  mattetti

  committed
  621d082

  Copy full SHA for 621d082

• fixed the specs to match the latest version of webrat

  mattetti

  committed
  2f52938

  Copy full SHA for 2f52938

Commits on Jun 30, 2009

• Patch security vulnerability in json_pure 1.1.6.

  

  Yehuda Katz + Carl Lerche

  committed
  8300b86

  Copy full SHA for 8300b86

• Bump version to 1.0.12 for release

  

  Yehuda Katz + Carl Lerche

  committed
  a6bead6

  Copy full SHA for a6bead6

Commits on Aug 21, 2009

• populate toplevel LICENSE file with MIT License

  

  jtimberman

  authored and

  wycats

  committed
  e01eac0

  Copy full SHA for e01eac0

Commits on Sep 9, 2009

• [merb-core] bumped Merb::DO_VERSION and Merb::DM_VERSION to 0.10.0

  

  snusnu

  authored and

  teamon

  committed
  b2e2bbb

  Copy full SHA for b2e2bbb

• [merb_datamapper] updated dependencies

  

  snusnu

  authored and

  teamon

  committed
  6db47aa

  Copy full SHA for 6db47aa

• [merb_datamapper] fixed rake db:automigrate

  

  snusnu

  authored and

  teamon

  committed
  8af779c

  Copy full SHA for 8af779c

• [merb_datamapper] fixed deprecation warnings

  

  snusnu

  authored and

  teamon

  committed
  1503d93

  Copy full SHA for 1503d93

• [merb_datamapper] fixed typo in rake task debug message

  

  snusnu

  authored and

  teamon

  committed
  3db4e32

  Copy full SHA for 3db4e32

• [merb_datamapper] define lazy properties after models were loaded

  Show description for cefee4a
  

  snusnu

  authored and

  teamon

  committed
  cefee4a

  Copy full SHA for cefee4a

• [merb_datamapper] fixed session configuration.

  Show description for f2eed0b
  

  protocarl

  authored and

  teamon

  committed
  f2eed0b

  Copy full SHA for f2eed0b

• [merb-core] fixed overwriting of config options on rake tasks [#1270]

  

  ojak

  authored and

  teamon

  committed
  13db054

  Copy full SHA for 13db054

Commits on Sep 18, 2009

• [merb_datamapper] Fixed raketasks for migrations

  snusnu

  committed
  ccb4235

  Copy full SHA for ccb4235

Commits on Sep 24, 2009

• [merb_datamapper] Perform IM wrapping at the rack level

  Show description for bb5b992
  snusnu

  committed
  bb5b992

  Copy full SHA for bb5b992

Commits on Sep 25, 2009

• [merb] Fixed failing rake install due to missing merb-more

  snusnu

  committed
  aa6b2fc

  Copy full SHA for aa6b2fc

• [merb-helpers] Generate valid html id attributes

  Show description for 6478336
  snusnu

  committed
  6478336

  Copy full SHA for 6478336

Commits on Sep 27, 2009

• [merb-core] Fix run_later to work on servers other than just 'merb'

  Show description for 26835c8
  

  FooBarWidget

  authored and

  snusnu

  committed
  26835c8

  Copy full SHA for 26835c8

• [merb-auth-more] Original :length constraints for dm_salted_user

  Show description for 45116f1
  snusnu

  committed
  45116f1

  Copy full SHA for 45116f1

Commits on Sep 29, 2009

• [merb-gen] Don't add resource route when using -p or -d

  Show description for d42a369
  snusnu

  committed
  d42a369

  Copy full SHA for d42a369

Commits on Oct 1, 2009

• [merb_datamapper] Depend on the '~> 0.10' series

  snusnu

  committed
  214543f

  Copy full SHA for 214543f

• [merb-core] Fixed multipart specs (including spec10)

  Show description for 75eb0fc
  

  merbjedi

  authored and

  snusnu

  committed
  75eb0fc

  Copy full SHA for 75eb0fc

• [merb-assets] Don't rely on hash ordering in specs

  Show description for a45c4a8
  snusnu

  committed
  a45c4a8

  Copy full SHA for a45c4a8

• [merb_datamapper] Depend on Merb::DM_VERSION

  snusnu

  committed
  b575998

  Copy full SHA for b575998

• [merb_datamapper] Don't use gem method if not necessary

  snusnu

  committed
  6eefe62

  Copy full SHA for 6eefe62

Commits on Oct 2, 2009

• [merb-gen] config/dependencies.rb requires "~> #{DM_VERSION}" in stack apps

  snusnu

  committed
  b8eb936

  Copy full SHA for b8eb936

• Changed plugin dependencies to "~> #{Merb::VERSION}"

  snusnu

  committed
  633e859

  Copy full SHA for 633e859

• Install the merb meta-package as the last one

  snusnu

  committed
  960192b

  Copy full SHA for 960192b

• Fixed rake uninstall to uninstall everything that got rake install'ed

  snusnu

  committed
  d41ee6a

  Copy full SHA for d41ee6a

• [merb-cache] Not using Time.today in specs makes them more robust

  snusnu

  committed
  f9b723c

  Copy full SHA for f9b723c

• Bumped version in preparation for release

  snusnu

  committed
  161a626

  Copy full SHA for 161a626

• [merb-helpers] Avoid dm-0.10 deprecation warnings

  Show description for 35404ab
  snusnu

  committed
  35404ab

  Copy full SHA for 35404ab

Commits on Oct 20, 2009

• [merb-core] Fixed docs for replacing an existing logger

  snusnu

  committed
  c6642b7

  Copy full SHA for c6642b7

Commits on Oct 22, 2009

• [merb-core] Allow testing without webrat

  Show description for 8dd17dd
  

  merbjedi

  authored and

  snusnu

  committed
  8dd17dd

  Copy full SHA for 8dd17dd

• [merb-core] Fixed focs for Merb::Router::Behavior#to

  Show description for 260c696
  snusnu

  committed
  260c696

  Copy full SHA for 260c696

• [merb-auth-slice-password] Use proper config value

  Show description for 9c44e16
  snusnu

  committed
  9c44e16

  Copy full SHA for 9c44e16

• [merb_datamapper] Print merb-gen message only for dm models

  Show description for 7d730e7
  

  merbjedi

  authored and

  snusnu

  committed
  7d730e7

  Copy full SHA for 7d730e7

• [merb-haml] Fixed compilation of sass files

  Show description for cb5c783
  snusnu

  committed
  cb5c783

  Copy full SHA for cb5c783

• Fix potential timing attack on cookie sessions

  Show description for 7e30838
  

  namelessjon

  authored and

  snusnu

  committed
  7e30838

  Copy full SHA for 7e30838

Commits on Oct 23, 2009

• [merb-gen] Fixing generated thor task to work with RubyGems 1.3.5.

  Show description for df8ebd4
  

  merbjedi

  authored and

  snusnu

  committed
  df8ebd4

  Copy full SHA for df8ebd4

• [merb-gen] Explain how to load dependencies in (very) flat apps

  Show description for 2990598
  

  pk

  authored and

  snusnu

  committed
  2990598

  Copy full SHA for 2990598

Commits on Oct 24, 2009

• [merb-core] -i and --irb-console take precedence over config in init.rb.

  Show description for 8d84d2a
  

  pk

  authored and

  snusnu

  committed
  8d84d2a

  Copy full SHA for 8d84d2a

Commits on Oct 26, 2009

• [merb-core] Fixed link to extlib in error message

  snusnu

  committed
  7d9a669

  Copy full SHA for 7d9a669

• [merb-gen] Add default rspec options to spec.opts file

  Show description for db4357f
  snusnu

  committed
  db4357f

  Copy full SHA for db4357f

• [merb-helpers] Select the correct field in select tags

  

  teamon

  authored and

  snusnu

  committed
  b26df5a

  Copy full SHA for b26df5a

Commits on Oct 30, 2009

• Updated CHANGELOG

  snusnu

  committed
  aa09e3a

  Copy full SHA for aa09e3a