Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 123 | -626/+681 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | ruby-prof isn't compatible with ruby trunk after 36925 | Jeremy Kemper | 2012-10-15 | 1 | -2/+2 | |
* | | | | | | Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -4/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Removed useless "extend SanitizeHelper::ClassMethods" | Andrey Samsonov | 2012-10-15 | 1 | -4/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #7952 from ayrton/minor_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -5/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Minor cleanup, helper method was only used once | Ayrton De Craene | 2012-10-15 | 1 | -5/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7947 from acapilleri/uniqueness_validate | Rafael Mendonça França | 2012-10-14 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | refactoring of uniqueness validate_each | Angelo Capilleri | 2012-10-14 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7942 from IPGlider/master | Rafael Mendonça França | 2012-10-14 | 2 | -1/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix typo in inet and cidr saving | Miguel Herranz | 2012-10-14 | 2 | -1/+14 | |
* | | | | | | Fix typo in #7941 | Jeremy Kemper | 2012-10-14 | 1 | -1/+1 | |
* | | | | | | The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. | Jeremy Kemper | 2012-10-14 | 1 | -1/+1 | |
* | | | | | | Merge pull request #7941 from robin850/master | Jeremy Kemper | 2012-10-14 | 94 | -447/+447 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 94 | -447/+447 | |
* | | | | | | | Merge pull request #7943 from NARKOZ/patch-4 | Jeremy Kemper | 2012-10-14 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-multiple... | Rafael Mendonça França | 2012-10-13 | 6 | -15/+61 | |
|\| | | | | | ||||||
| * | | | | | #7914 Remove code for unsupported postgreSQL version. | Arturo Pie | 2012-10-13 | 2 | -6/+0 | |
| * | | | | | #7914 Using a better way to get the defaults from db. | Arturo Pie | 2012-10-13 | 2 | -6/+7 | |
| * | | | | | #7914 Add change of previous commit to CHANGELOG.md | Arturo Pie | 2012-10-13 | 1 | -0/+4 | |
| * | | | | | #7914 get default value when type uses schema name | Arturo Pie | 2012-10-13 | 4 | -3/+50 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7935 from leereilly/minor-gemfile-twerk | Rafael Mendonça França | 2012-10-13 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replace double quotes with single quotes | Lee Reilly | 2012-10-13 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Test that a Rails.queue consumer is automatically started in production | Jeremy Kemper | 2012-10-13 | 3 | -3/+14 | |
* | | | | | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 10 | -26/+14 | |
* | | | | | Tighten up asset precompile tests | Jeremy Kemper | 2012-10-12 | 2 | -4/+3 | |
* | | | | | Remove the queue container. Premature consolidation. Set up and maintain queu... | Jeremy Kemper | 2012-10-12 | 5 | -68/+9 | |
* | | | | | Merge pull request #7891 from schneems/schneems/rake_command_warning | José Valim | 2012-10-12 | 1 | -23/+32 | |
|\ \ \ \ \ | ||||||
| * | | | | | Prompt to run rake when accidentally typed rails | schneems | 2012-10-12 | 1 | -23/+32 | |
* | | | | | | performance improvements to joins! | Aaron Patterson | 2012-10-12 | 2 | -5/+13 | |
* | | | | | | Speed up relation merging by reducing calls to Array#- | Aaron Patterson | 2012-10-12 | 1 | -3/+5 | |
* | | | | | | Merge pull request #7007 from Mik-die/hash_extract | Rafael Mendonça França | 2012-10-12 | 4 | -6/+49 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add more testcases and doc about Hash#extract! | Mikhail Dieterle | 2012-10-08 | 3 | -6/+21 | |
| * | | | | | | make Hash#extract! more symmetric with Hash#slice | Mikhail Dieterle | 2012-10-08 | 3 | -3/+31 | |
* | | | | | | | Merge pull request #7926 from senny/whitespace_cleanup | Rafael Mendonça França | 2012-10-12 | 1 | -12/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | trailling whitespace cleanup in query_methods.rb | Yves Senn | 2012-10-12 | 1 | -12/+12 | |
| | | | * | | | | Remove old asset_path from rails config | Joshua Peek | 2012-10-15 | 3 | -26/+1 | |
| | | | * | | | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 7 | -246/+2 | |
| | | | * | | | | merge! default asset tag options | Joshua Peek | 2012-10-15 | 1 | -12/+12 | |
| | | | * | | | | Just check request instead of controller.request | Joshua Peek | 2012-10-15 | 1 | -13/+2 | |
| | | | * | | | | Allow asset url config to be undefined | Joshua Peek | 2012-10-13 | 2 | -2/+45 | |
| | | | * | | | | Add a few more compute_asset_path tests | Joshua Peek | 2012-10-13 | 1 | -0/+8 | |
| | | | * | | | | All asset url helpers should pass options | Joshua Peek | 2012-10-12 | 1 | -24/+24 | |
| | | | * | | | | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore | Joshua Peek | 2012-10-12 | 1 | -28/+0 | |
| | | | * | | | | Ensure AssetUrlHelper can be mixed into AC::Base | Joshua Peek | 2012-10-12 | 2 | -6/+46 | |
| | | | * | | | | Refactor AssetUrlHelper to make it friendly for plugins and extensions | Joshua Peek | 2012-10-12 | 9 | -346/+275 | |
| | | | * | | | | Add asset_path and asset_url helpers | Joshua Peek | 2012-10-12 | 3 | -17/+72 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #7923 from josh/seperate-asset-tag-and-url-concerns | Rafael Mendonça França | 2012-10-12 | 5 | -419/+416 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Split asset url helpers into seperate AssetUrlHelper | Joshua Peek | 2012-10-12 | 5 | -419/+416 | |
|/ / / / / / | ||||||
* | | | | | | ActiveSupport::SynchronousQueue doesn't have the drain method. | Rafael Mendonça França | 2012-10-12 | 1 | -4/+4 |