aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extract compute_asset_extname and allow extname to be disabledJoshua Peek2012-10-152-13/+30
* Sprockets-rails branchJoshua Peek2012-10-151-1/+1
* Use sprockets-rails branch for nowJoshua Peek2012-10-151-2/+2
* Merge branch 'master' into asset-path-helperJoshua Peek2012-10-15123-626/+681
|\
| * ruby-prof isn't compatible with ruby trunk after 36925Jeremy Kemper2012-10-151-2/+2
| * Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanupSantiago Pastorino2012-10-151-4/+0
| |\
| | * Removed useless "extend SanitizeHelper::ClassMethods"Andrey Samsonov2012-10-151-4/+0
| * | Merge pull request #7952 from ayrton/minor_cleanupSantiago Pastorino2012-10-151-5/+1
| |\ \ | | |/ | |/|
| | * Minor cleanup, helper method was only used onceAyrton De Craene2012-10-151-5/+1
| |/
| * Merge pull request #7947 from acapilleri/uniqueness_validateRafael Mendonça França2012-10-141-1/+2
| |\
| | * refactoring of uniqueness validate_eachAngelo Capilleri2012-10-141-1/+2
| |/
| * Merge pull request #7942 from IPGlider/masterRafael Mendonça França2012-10-142-1/+14
| |\
| | * Fix typo in inet and cidr savingMiguel Herranz2012-10-142-1/+14
| * | Fix typo in #7941Jeremy Kemper2012-10-141-1/+1
| * | The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now.Jeremy Kemper2012-10-141-1/+1
| * | Merge pull request #7941 from robin850/masterJeremy Kemper2012-10-1494-447/+447
| |\ \
| | * | Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1494-447/+447
| * | | Merge pull request #7943 from NARKOZ/patch-4Jeremy Kemper2012-10-141-2/+4
| |\ \ \ | | |/ / | |/| |
| | * | remove 'then' from conditional statementNihad Abbasov2012-10-141-2/+4
| |/ /
| * | Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-multiple...Rafael Mendonça França2012-10-136-15/+61
| |\|
| | * #7914 Remove code for unsupported postgreSQL version.Arturo Pie2012-10-132-6/+0
| | * #7914 Using a better way to get the defaults from db.Arturo Pie2012-10-132-6/+7
| | * #7914 Add change of previous commit to CHANGELOG.mdArturo Pie2012-10-131-0/+4
| | * #7914 get default value when type uses schema nameArturo Pie2012-10-134-3/+50
| |/
| * Merge pull request #7935 from leereilly/minor-gemfile-twerkRafael Mendonça França2012-10-131-1/+1
| |\
| | * Replace double quotes with single quotesLee Reilly2012-10-131-1/+1
| |/
| * Test that a Rails.queue consumer is automatically started in productionJeremy Kemper2012-10-133-3/+14
| * Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-1210-26/+14
| * Tighten up asset precompile testsJeremy Kemper2012-10-122-4/+3
| * Remove the queue container. Premature consolidation. Set up and maintain queu...Jeremy Kemper2012-10-125-68/+9
| * Merge pull request #7891 from schneems/schneems/rake_command_warningJosé Valim2012-10-121-23/+32
| |\
| | * Prompt to run rake when accidentally typed railsschneems2012-10-121-23/+32
| * | performance improvements to joins!Aaron Patterson2012-10-122-5/+13
| * | Speed up relation merging by reducing calls to Array#-Aaron Patterson2012-10-121-3/+5
| * | Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-124-6/+49
| |\ \
| | * | add more testcases and doc about Hash#extract!Mikhail Dieterle2012-10-083-6/+21
| | * | make Hash#extract! more symmetric with Hash#sliceMikhail Dieterle2012-10-083-3/+31
| * | | Merge pull request #7926 from senny/whitespace_cleanupRafael Mendonça França2012-10-121-12/+12
| |\ \ \
| | * | | trailling whitespace cleanup in query_methods.rbYves Senn2012-10-121-12/+12
* | | | | Remove old asset_path from rails configJoshua Peek2012-10-153-26/+1
* | | | | :fire: Rails asset id supportJoshua Peek2012-10-157-246/+2
* | | | | merge! default asset tag optionsJoshua Peek2012-10-151-12/+12
* | | | | Just check request instead of controller.requestJoshua Peek2012-10-151-13/+2
* | | | | Allow asset url config to be undefinedJoshua Peek2012-10-132-2/+45
* | | | | Add a few more compute_asset_path testsJoshua Peek2012-10-131-0/+8
* | | | | All asset url helpers should pass optionsJoshua Peek2012-10-121-24/+24
* | | | | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymoreJoshua Peek2012-10-121-28/+0
* | | | | Ensure AssetUrlHelper can be mixed into AC::BaseJoshua Peek2012-10-122-6/+46
* | | | | Refactor AssetUrlHelper to make it friendly for plugins and extensionsJoshua Peek2012-10-129-346/+275
* | | | | Add asset_path and asset_url helpersJoshua Peek2012-10-123-17/+72
|/ / / /