aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge pull request #7923 from josh/seperate-asset-tag-and-url-concernsRafael Mendonça França2012-10-125-419/+416
|\
| * Split asset url helpers into seperate AssetUrlHelperJoshua Peek2012-10-125-419/+416
|/
* ActiveSupport::SynchronousQueue doesn't have the drain method.Rafael Mendonça França2012-10-121-4/+4
* Move the TestQueue tests to the proper fileRafael Mendonça França2012-10-122-47/+44
* Merge pull request #7871 from bjnord/masterRafael Mendonça França2012-10-123-8/+12
|\
| * Add .rake to `rake notes` and `rake notes:custom`Brent J. Nordquist2012-10-123-8/+12
* | Merge pull request #7913 from mje113/masterXavier Noria2012-10-121-0/+4
|\ \
| * | Padding expires_in by 5 minutes on dalli key write to facilitate :race_condit...Mike Evans2012-10-111-0/+4
* | | Merge pull request #7919 from arunagw/warning_removed_shadowingRafael Mendonça França2012-10-121-2/+2
|\ \ \
| * | | warning removed: shadowing outer local variable - valueArun Agrawal2012-10-121-2/+2
* | | | Merge pull request #7765 from insside/clever-orderJon Leighton2012-10-123-4/+73
|\ \ \ \ | |_|_|/ |/| | |
| * | | learn ActiveRecord::QueryMethods#order work with hash argumentsTima Maslyuchenko2012-10-123-4/+73
|/ / /
* / / Immediately run queued jobs in tests. Otherwise you have to explicitly drain ...Jeremy Kemper2012-10-122-5/+5
|/ /
* | Don't allocate new strings in compiled attribute methodsJon Leighton2012-10-122-20/+39
* | Revert "Key the attributes hash with symbols"Jon Leighton2012-10-124-14/+10
* | Merge pull request #7917 from dfens/masterJosé Valim2012-10-128-8/+8
|\ \
| * | Cleanup trailing whitespacesdfens2012-10-128-8/+8
|/ /
* | Merge pull request #7915 from frodsan/docs_permitRafael Mendonça França2012-10-111-0/+22
|\ \
| * | update AC::Parameters#permit documentation [ci skip]Francesco Rodriguez2012-10-111-0/+22
|/ /
* | When executing permit with just a key that points to a hash, DO NOT allow all...Santiago Pastorino2012-10-122-2/+9
* | adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73Aaron Patterson2012-10-111-0/+14
* | Merge pull request #7912 from mrship/masterRafael Mendonça França2012-10-114-1/+8
|\ \ | |/ |/|
| * Allow for deep directory path for view templates.Andy Shipman2012-10-114-1/+8
|/
* Merge pull request #7886 from senny/3675_assert_template_twice_against_same_p...Rafael Mendonça França2012-10-115-13/+50
|\
| * refactor `ActionView::TestCase` internals to track rendered localsYves Senn2012-10-112-20/+33
| * recognizes when a partial was rendered twice. Closes #3675Yves Senn2012-10-115-9/+33
* | Merge pull request #7908 from arunagw/build_fix_railtiesRafael Mendonça França2012-10-111-5/+0
|\ \ | |/ |/|
| * No need to test for rack-cache present in GemfileArun Agrawal2012-10-111-5/+0
|/
* Merge pull request #7050 from kytrinyx/documentation-reset-column-infoVijay Dev2012-10-101-0/+21
|\
| * Expand caveat about models in migrations (rails guide)Katrina Owen2012-10-101-0/+21
* | Merge pull request #7904 from jfirebaugh/eager_autoloadRafael Mendonça França2012-10-101-10/+14
|\ \
| * | Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
|/ /
* | Remove the leading :: constant qualifier in the ActiveRecord::Fixtures deprec...Jeremy Kemper2012-10-101-1/+1
* | Upgrade to a jquery-rails that doesn't expect config.action_view.javascript_e...Jeremy Kemper2012-10-101-1/+1
|/
* Merge pull request #7887 from senny/remove_unused_requires_in_ar_testsVijay Dev2012-10-104-4/+0
|\
| * remove duplicated require statements in AR test casesYves Senn2012-10-094-4/+0
* | Fixing build failuresVijay Dev2012-10-116-14/+14
* | Merge pull request #7898 from olivierlacan/pg_homebrew_instructionsVijay Dev2012-10-101-1/+3
|\ \
| * | Offer instructions for pg gem when installed via HomebrewOlivier Lacan2012-10-101-1/+3