wycats / merb-more fork watch download tarball
public
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-more.git
Search Repo:
merb-more / Commit History feed

03/04/08

ignore bundle, and merb-more.rb
ivey (author)
Tue Mar 04 21:54:35 -0800 2008
commit  bf90c94a5d04eea7e65506344f73e2703bf0a182
tree    dbc08b3ebf19a58f4e5d6567b7049e7a4b679b6f
parent  b79985a36c29537351d31f81fd79f7202687b681 
create merb-more.rb
ivey (author)
Tue Mar 04 21:39:13 -0800 2008
commit  b79985a36c29537351d31f81fd79f7202687b681
tree    b8e2f3e490967db1e361c68c49728f46585f603b
parent  e5c210ece78da2e2dddd58f182a24486412073b5 
Calling rake spec instead of rake specs (#59)
wycats (author)
Tue Mar 04 14:13:39 -0800 2008
commit  e5c210ece78da2e2dddd58f182a24486412073b5
tree    a2c9e69479732222a1a566a8d174bc4c615e92e9
parent  de2439c679e73c1cab5cf1ba4f4fb3633c2d98b4 
Frozen merb should mirror changes to bin/merb
wvl (author)
Sat Mar 01 14:08:05 -0800 2008
wycats (committer)
Tue Mar 04 13:58:29 -0800 2008
commit  de2439c679e73c1cab5cf1ba4f4fb3633c2d98b4
tree    65e4158e7e6fd157ce9c0a5fea99ac63e1e7c59c
parent  2e91e97e0b2a403996c9f6a1bd016da811782285 
Fixes #64 (merb-mailer gobbles too many exceptions); patch submitted by 
Aaron Wheeler
wycats (author)
Tue Mar 04 13:55:15 -0800 2008
commit  2e91e97e0b2a403996c9f6a1bd016da811782285
tree    dbf7fc83435323ea7251ecb39e050f5d41e4fcea
parent  7fde37b4f0457e797a7727f0218e191693e251ae 
Replaces outdated rspec stubs (#65)
wycats (author)
Tue Mar 04 13:50:39 -0800 2008
commit  7fde37b4f0457e797a7727f0218e191693e251ae
tree    30b1261de01e3513d000e31b0d36fa5abb800b4d
parent  576d1ad238deddcb285aaa053d8df9592e99f264 
Mailer documentation
Janne Asmala (author)
Fri Feb 29 00:08:49 -0800 2008
wycats (committer)
Tue Mar 04 13:47:04 -0800 2008
commit  576d1ad238deddcb285aaa053d8df9592e99f264
tree    96990397f6227b3d03b6695f133a65ca7893605f
parent  b5e79723200fb3d977876156dde05b0fda9cb525 
Better formatted 406.
wycats (author)
Tue Mar 04 13:28:20 -0800 2008
commit  b5e79723200fb3d977876156dde05b0fda9cb525
tree    f88571a3e9b5c3fce075ed365ed11ab479b09be9
parent  3e2d8f3ba956827130a9dbd91bf1d5211b2b2efc 
Merge branch 'master' of git@github.com:wycats/merb-more
wycats (author)
Tue Mar 04 13:24:46 -0800 2008
commit  3e2d8f3ba956827130a9dbd91bf1d5211b2b2efc
tree    595fd81da93e796f444df683c61d0e3aa2bbeb39
parent  c1ecfc0f319520e932502991e5159a3be94cfb30 parent  a8fd459e79f05cbdb1a8aba9ea85689e87f71f08 
Provide better 406 details.
wycats (author)
Tue Mar 04 13:24:26 -0800 2008
commit  c1ecfc0f319520e932502991e5159a3be94cfb30
tree    3043a6a93e625cee45d244c1e609a80f593fc7d1
parent  d55d5857094f5e55773090aeef024414f78681ae

03/03/08

merb-mailer requires mailfactory.
wycats (author)
Mon Mar 03 14:00:27 -0800 2008
commit  d55d5857094f5e55773090aeef024414f78681ae
tree    2293db6a7a9e3042243e2a417e3e723f9c133512
parent  0c6e0626523c96c4a5872a92e55a1a09c1f3a1e3

02/29/08

remove reference to merb.yml
ivey (author)
Fri Feb 29 20:50:29 -0800 2008
commit  0c6e0626523c96c4a5872a92e55a1a09c1f3a1e3
tree    288810da312b1c65f18b31308a3e80606b575259
parent  81c3db365c0a2acf5f06f75d53950d134f3621b8 
Prep for 0.9.1
ivey (author)
Fri Feb 29 20:10:10 -0800 2008
commit  81c3db365c0a2acf5f06f75d53950d134f3621b8
tree    123ca2f57d42408321549cf8de52ea3287ce5f5d
parent  ebdfa1ab15fd0304cedb71f980e1b6d179e027e0 
Removing references to merb-test and fake_request helper
benburkert (author)
Fri Feb 29 19:50:22 -0800 2008
commit  ebdfa1ab15fd0304cedb71f980e1b6d179e027e0
tree    04b78578bfc660f494249ad784f11705f0ddd4f4
parent  82207c2be14ab681605bb387ff65336aeaa26935 
Merge branch 'master' of git@github.com:wycats/merb-more
wycats (author)
Fri Feb 29 13:08:59 -0800 2008
commit  82207c2be14ab681605bb387ff65336aeaa26935
tree    0bb864c9a5e18f5648623b4db286d0e68bc1c3d2
parent  5da0cfceed88c2f269ea504c5b64338604bb84f9 parent  9923ce9e389c590ffd9d0e96324eae3cf0d02208

02/28/08

Merge branch 'master' into removing_test
benburkert (author)
Thu Feb 28 21:36:43 -0800 2008
commit  5da0cfceed88c2f269ea504c5b64338604bb84f9
tree    5ce66700e7901656ac70d312ae3b432bd921f43f
parent  471e915c2fc6fc1b6aa500bdfb9d847d890abd09 parent  b07840e5e1d01497dc68d493d415c9e98cde20bf 
rm -rf merb-test
benburkert (author)
Thu Feb 28 21:22:33 -0800 2008
commit  471e915c2fc6fc1b6aa500bdfb9d847d890abd09
tree    012cfc47c7701d7a827c78d1ecbb8ce17b60d708
parent  2efd81df18f10a8287c82a1ae0560fa3c46e9a83 
rename class to correctly be MerbResourceControllerTestGenerator
jackdempsey (author)
Thu Feb 28 15:07:02 -0800 2008
wycats (committer)
Thu Feb 28 16:52:14 -0800 2008
commit  2efd81df18f10a8287c82a1ae0560fa3c46e9a83
tree    c1d29cc8e7f3a90897a8d118a25ceb31f50e7afb
parent  1dc8750aee0f8f9bc47a482461c072791f051e69 
merb-gen upgraded rubigen dependency to 1.2.4 for bug fix
drnic (author)
Thu Feb 28 14:54:20 -0800 2008
commit  1dc8750aee0f8f9bc47a482461c072791f051e69
tree    bb59d44f81dd33fb7e12e8e4e7d03c250c822832
parent  b45d4a110f1a2eaa8f54bece0483e0254042f7b1 
Resolved #52 (patch by Tim Kofol)
wycats (author)
Thu Feb 28 11:31:05 -0800 2008
commit  b45d4a110f1a2eaa8f54bece0483e0254042f7b1
tree    1629a036c55180dd808f86daedc492704cf2bb5a
parent  2885ba24bf840996ceba6d636aa8fd3adbeab98e 
Assets documentation
Janne Asmala (author)
Thu Feb 28 03:30:36 -0800 2008
wycats (committer)
Thu Feb 28 11:27:05 -0800 2008
commit  2885ba24bf840996ceba6d636aa8fd3adbeab98e
tree    3bee29b032f69c5321f3f0d67901e353f16e4b1e
parent  8cb6e8c1213c1bf63798e4916f2e92e053591caf

02/27/08

Kills haml buffer bug fast.
foysavas (author)
Wed Feb 27 16:03:58 -0800 2008
wycats (committer)
Wed Feb 27 16:08:02 -0800 2008
commit  8cb6e8c1213c1bf63798e4916f2e92e053591caf
tree    38fd490ea2bd5923522677202f1eb0c3ea467b68
parent  e154b38e11f9bafaacc7b3bb16a9430e711c46a5 
Resolves #11
wycats (author)
Wed Feb 27 12:37:17 -0800 2008
commit  e154b38e11f9bafaacc7b3bb16a9430e711c46a5
tree    eeddecbfd709df409e1d959bda18046ab23b79ac
parent  98626f52a6c168f5eeebd8a39e84d3a64e3785f9 
Merge branch 'master' of git@github.com:wycats/merb-more
wycats (author)
Wed Feb 27 12:33:09 -0800 2008
commit  98626f52a6c168f5eeebd8a39e84d3a64e3785f9
tree    60f0aca8e0e2e2e7862840c2c599e1b5fe39f0ec
parent  a45e763cb71746c9abb629dcaaa2ddc47d83ca4b parent  0c19134646e7fe56fbd592247b0f054a722c485b 
Makes merb-gen use the test framework specified by the command-line 
argument (defaults to merb_rspec)
wycats (author)
Wed Feb 27 12:32:50 -0800 2008
commit  a45e763cb71746c9abb629dcaaa2ddc47d83ca4b
tree    923b1bf8bad7ff2138cef5f5b5494161fb0cc26f
parent  de0d12388033602db210399afd209b2aab6e3b61

02/26/08

Might fix Haml issue.
wycats (author)
Tue Feb 26 16:24:38 -0800 2008
commit  de0d12388033602db210399afd209b2aab6e3b61
tree    912ffd4d52b85bfaf01b8a934741e94ed0b36703
parent  320d18640c81724ce4133056b4c1df19eaaf98c5 
Closes #45
wycats (author)
Tue Feb 26 15:30:10 -0800 2008
commit  320d18640c81724ce4133056b4c1df19eaaf98c5
tree    4e4061df2e8431a6e4985d778dd64db285f07270
parent  1f72239a596548785731b99ce5e53e5c7e7787b1 
Should fix merb-parts and merb-mailers.
wycats (author)
Tue Feb 26 15:14:13 -0800 2008
commit  1f72239a596548785731b99ce5e53e5c7e7787b1
tree    a16788d9b62c44db47906a9757f4b5e4590c90f9
parent  940c38dac03c5b7f895f1eab8e52f6302b845d9e 
Wait to load parts
wycats (author)
Tue Feb 26 15:03:03 -0800 2008
commit  940c38dac03c5b7f895f1eab8e52f6302b845d9e
tree    a4f898bf41208174d04da2d11a5b3e4bfbc22a31
parent  b234e89d45077a5b8976f90a99b4cb13bb0c8792 
Use dir_for(:mailer) for the mailer path
wycats (author)
Tue Feb 26 15:01:23 -0800 2008
commit  b234e89d45077a5b8976f90a99b4cb13bb0c8792
tree    2f15ac247336a712fc7264bb4abea36aed4062a2
parent  b26524d6da02451f4b838a63dc52f849c78e8c9c