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
merb-more / Commit History feed

04/20/08

merb-freezer now unshifts instead of pushes (vanpelt)
mattetti (author)
Sun Apr 20 18:28:11 -0700 2008
commit  9645de9130e80e109e2ae8c4a9422f02ad6e0ea1
tree    e8470787c42bce86efdd2f09393cedd6ec1865e6
parent  e9378f505952030bb675394f3d4dc6279809a986 
updated documentation explaining the new % frozen-merb --merb-root 
argument
mattetti (author)
Sun Apr 20 10:22:35 -0700 2008
commit  e9378f505952030bb675394f3d4dc6279809a986
tree    8ed5d681c7694557a01e5a2df3123e0f1b8b5806
parent  174c62b2cfa74bf8724ff1e1fd67dc222933daf7 
Makes frozen_merb bin work outside of the working directory (for god 
scripts for instance) by looking for the -m command line option
vanpelt (author)
Sat Apr 19 15:29:07 -0700 2008
mattetti (committer)
Sun Apr 20 10:19:02 -0700 2008
commit  174c62b2cfa74bf8724ff1e1fd67dc222933daf7
tree    c8c88ad3c315fe9fc5061ed2f9c039ed6b5cd6ff
parent  a7d7082073edaca161ef069d2a2f62d9e7af9fbe

04/17/08

Merge branch 'master' of git@github.com:wycats/merb-more into gem
mattetti (author)
Thu Apr 17 23:02:39 -0700 2008
commit  a7d7082073edaca161ef069d2a2f62d9e7af9fbe
tree    3daffc5b07b8bd4ca9fab7456b3ff3361ca3bc6d
parent  688a4e61f28328700129386f6e9bcef80a0660a6 parent  895191cf8c047fe28b38ff5bf3f807423b662f1a 
udpated documentation to reflect merb-freezer latest changes
mattetti (author)
Thu Apr 17 23:01:12 -0700 2008
commit  688a4e61f28328700129386f6e9bcef80a0660a6
tree    8492d4612c872e8b61fb210f44aab8a9fe671ab6
parent  29e2eeebeb14a42cfb2cb7a8f25fa03b33e14d1a 
fixed stupid submodule freezer
mattetti (author)
Thu Apr 17 22:45:27 -0700 2008
commit  29e2eeebeb14a42cfb2cb7a8f25fa03b33e14d1a
tree    0840d86d2f5413468d164855e44809abaf314270
parent  4aaf999438dc9aa558a2edfb263d1995f7a98a88 
Add dependencies for action-args and Haml
wycats (author)
Thu Apr 17 19:17:48 -0700 2008
commit  895191cf8c047fe28b38ff5bf3f807423b662f1a
tree    2bb67b9a235de9294b19e8c7b8276ecfc0b3ea4b
parent  7593cf8bc25896a527c154008af5f27596642625 
adding gem freezing, submodules might not work properly yet
mattetti (author)
Thu Apr 17 00:44:08 -0700 2008
commit  4aaf999438dc9aa558a2edfb263d1995f7a98a88
tree    087d55c261c546f36c46454de2f806a0248308a3
parent  7593cf8bc25896a527c154008af5f27596642625

04/14/08

removed merb-core dependency so frozen-merb can work properly Comment
mattetti (author)
Mon Apr 14 22:24:17 -0700 2008
commit  7593cf8bc25896a527c154008af5f27596642625
tree    6478ba47080c80d62af171b89979f824c0d79fff
parent  f57c6f2efb8d75d45a22003aa3f39aaad92260d8 
added simple message to let the user know what merb-core gem is being used
mattetti (author)
Mon Apr 14 21:56:05 -0700 2008
commit  f57c6f2efb8d75d45a22003aa3f39aaad92260d8
tree    2c5c33ce5c041dcda4a5da2814ae92e9ed6841b9
parent  7d62cb263f046bd4b708649a5b6c8be4cc19f354 
finally fixed the submodules freezer
mattetti (author)
Mon Apr 14 20:20:54 -0700 2008
commit  7d62cb263f046bd4b708649a5b6c8be4cc19f354
tree    525e96d09374107c544dcd10d96334ebc1fa49f3
parent  d1dd14e38e2b34d7dddf9537f0b9aee6c1ee1601

04/13/08

Merge branch 'master' of git@github.com:wycats/merb-more
mattetti (author)
Sun Apr 13 22:04:15 -0700 2008
commit  d1dd14e38e2b34d7dddf9537f0b9aee6c1ee1601
tree    38d77f945a0c87340c430d0ced12896c4dad6938
parent  48b1072723b5d70035ae411b7eeb627290e15eec parent  1a247a5d31f37648a93124f8b1e6ba4df7cb5118 
started fixing the git submodules freezer
mattetti (author)
Sun Apr 13 22:03:38 -0700 2008
commit  48b1072723b5d70035ae411b7eeb627290e15eec
tree    684a724e52076b876d3730ab83bde5f8fdc8364c
parent  ec0cf0384000d8bbf29238081aa87ac0334f7650

04/12/08

Fix Rakefiles so they include the specs when generating the gems
daikini (author)
Sat Apr 12 08:18:42 -0700 2008
commit  1a247a5d31f37648a93124f8b1e6ba4df7cb5118
tree    814ac8d89f4b702e4c59a667cf5f7204527bfd67
parent  56e29c2b73850bbf69e9264a36da1ab209dc16e7

04/11/08

Merge branch 'ticket-103' of git://github.com/daikini/merb-more
ezmobius (author)
Fri Apr 11 16:35:27 -0700 2008
commit  56e29c2b73850bbf69e9264a36da1ab209dc16e7
tree    990b6a50bdf6a2a652b51c375f6c6f9e6e9cd28c
parent  ec0cf0384000d8bbf29238081aa87ac0334f7650 parent  0f419067401aa0ee3b6c9eede46da3cf7bce753d 
Fixes Merb::AssetsMixin errors from #103, also added specs
daikini (author)
Fri Apr 11 13:41:32 -0700 2008
commit  0f419067401aa0ee3b6c9eede46da3cf7bce753d
tree    9b320d8219b7533eaf9510c19c010e4549db7818
parent  f2fdc8a2ae7a9f2d8abaaffe9ad0d10833dc5b71 
Merge branch 'master' of git@github.com:wycats/merb-more
mattetti (author)
Fri Apr 11 11:27:00 -0700 2008
commit  ec0cf0384000d8bbf29238081aa87ac0334f7650
tree    8bd5ed47519384458af6b285f74f49dc76c89490
parent  1b321585956debec1202effa837a129027643be7 parent  f2fdc8a2ae7a9f2d8abaaffe9ad0d10833dc5b71 
added merb-freezer to merb-more install rake task
mattetti (author)
Fri Apr 11 11:25:40 -0700 2008
commit  1b321585956debec1202effa837a129027643be7
tree    ddd663c0436f0198c2015b2635b803df650b99cc
parent  7b61b001488dbe5f5ad0b00dc48ad45d4e051590 
refactored the rake tasks and added support for rubygems freeze using 
MODE=rubygems
mattetti (author)
Fri Apr 11 11:24:01 -0700 2008
commit  7b61b001488dbe5f5ad0b00dc48ad45d4e051590
tree    2e15dea93b99daf0f8a709c6616b1752fec3ac7d
parent  236883f012a93be3676bbf4fef3c24846be78a8d

04/10/08

Merge branch 'action-args-inherited-methods' of 
git@github.com:meekish/merb-more into action-args-inherited-methods
Jed Hurt (author)
Thu Apr 10 15:35:50 -0700 2008
commit  f2fdc8a2ae7a9f2d8abaaffe9ad0d10833dc5b71
tree    ca82f22ad91c18165d29e734e80898d2af12d402
parent  2ac2f9b5f3b91d9fe9b9699708252a525a998fa6 parent  abfa37eaa9c173ffcecd20ed89068b53a3a19604 
action-args: Add support for iherited/mixed-in controller actions
Jed Hurt (author)
Thu Apr 10 15:33:23 -0700 2008
commit  2ac2f9b5f3b91d9fe9b9699708252a525a998fa6
tree    ca82f22ad91c18165d29e734e80898d2af12d402
parent  236883f012a93be3676bbf4fef3c24846be78a8d 
action-args: Add support for iherited/mixed-in controller actions
Jed Hurt (author)
Thu Apr 10 15:07:04 -0700 2008
commit  abfa37eaa9c173ffcecd20ed89068b53a3a19604
tree    3348838d2e986d114d02f9c2ab439f08f2fa1eb7
parent  236883f012a93be3676bbf4fef3c24846be78a8d

04/09/08

fixed some of the merb-freezer rake task errors
mattetti (author)
Wed Apr 09 15:11:29 -0700 2008
commit  236883f012a93be3676bbf4fef3c24846be78a8d
tree    eb07a5a93ed2ab8e7ea6084ac6a3b7fd908b6c4a
parent  3c54506f069ca7e83116301e859ca562b0fb4c36 
fixed merb-freezer version
mattetti (author)
Wed Apr 09 08:52:36 -0700 2008
commit  3c54506f069ca7e83116301e859ca562b0fb4c36
tree    b6a5b18afd4322a8fcd9db0f2d69298179a74205
parent  f08c2d324af9c7bd875636b596343c0a4ab5f782

04/08/08

quick doc for github users
mattetti (author)
Tue Apr 08 23:50:24 -0700 2008
commit  f08c2d324af9c7bd875636b596343c0a4ab5f782
tree    1f0199d26bd5fe2965c3b54da595a91b7f9c91d5
parent  98bb0d5a33537f61adbba39d8467e0ff599f65b6 
moved the freezer rake tasks to merb-freezer
mattetti (author)
Tue Apr 08 23:43:04 -0700 2008
commit  98bb0d5a33537f61adbba39d8467e0ff599f65b6
tree    5d877b05994a6706f251e6c4d1220b8bef59ae49
parent  49ae567a0af1bcc24edfe012da935567e1cd77f3 
cleaned up the merb-gen TODO
mattetti (author)
Tue Apr 08 23:05:22 -0700 2008
commit  49ae567a0af1bcc24edfe012da935567e1cd77f3
tree    ce9f481e1b417cec673c05ad843948948772a3fd
parent  8c1c3112a024c91ecc706d70ccee3b82b464fa90 
Merge branch 'master' of git://github.com/wycats/merb-more + removed 
frozen merb generator since it got moved to its own plugin
mattetti (author)
Tue Apr 08 22:59:29 -0700 2008
commit  8c1c3112a024c91ecc706d70ccee3b82b464fa90
tree    59cc7c45642275b1091d3a2f7316737490464c91
parent  6f21837a541d01bc4c1cd4d5cdc878f5486ce290 parent  cc9090711a5b67b2c0214caa557252765cfca335 
removed the merb-frozen script generator since it's now available in the 
merb-freezer plugin
mattetti (author)
Tue Apr 08 22:40:25 -0700 2008
commit  6f21837a541d01bc4c1cd4d5cdc878f5486ce290
tree    a46faaf9af1ae33e18a17d4d276d4062515245e8
parent  11f3ef9c143f92ba74f44bd666ccabf519f5ed49 
Merge git://github.com/matta/merb-more
ezmobius (author)
Tue Apr 08 22:35:12 -0700 2008
commit  cc9090711a5b67b2c0214caa557252765cfca335
tree    37922b14dc2355739de923da964169f62e514ae8
parent  50a69836e00d388f084d2a3fab17b72c8fc5999b parent  11f3ef9c143f92ba74f44bd666ccabf519f5ed49