aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-071-2/+2
|\
| * fix assert_select_email to work on non-multipart emails as well as converting...Andrew Kaspick2011-08-111-2/+2
* | Nicolás Hock Isaza2011-09-061-1/+1
* | Eliminate newlines in basic auth. fixes #2882Aaron Patterson2011-09-061-1/+1
* | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-1/+3
|\ \
| * | Fix bug #2579.rails-noob2011-09-061-1/+3
* | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-061-1/+1
|\ \ \
| * | | config.action_controller.perform_caching isn't used anymore in assets pipelin...Guillermo Iguaran2011-09-061-1/+1
* | | | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ \ \
| * | | | No need to use a begin block thereDaniel Schierbeck2011-09-041-5/+3
* | | | | Merge pull request #2872 from sikachu/content_tag_html_safeSantiago Pastorino2011-09-051-1/+1
|\ \ \ \ \
| * | | | | Make sure that result from content_tag_for with collection is html_safePrem Sichanugrist2011-09-051-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2815 from avakhov/current-page-non-get-requestsSantiago Pastorino2011-09-051-0/+8
|\ \ \ \ \
| * | | | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-021-0/+8
* | | | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-051-3/+3
| |/ / / / |/| | | |
* | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, c...Guillermo Iguaran2011-09-041-2/+2
* | | | | if ... nil? is more expensive than unlessMilan Dobrota2011-09-047-11/+11
| |/ / / |/| | |
* | | | Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-041-5/+51
|\ \ \ \
| * | | | Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-041-5/+51
* | | | | fix helpers behavior descriptionAlexey Vakhov2011-09-031-3/+6
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-022-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix name of parent resource params when declaring nested resources at routesCarlos Paramio2011-09-011-6/+6
| * | | Improve examples: use each instead of for...inGabe Berke-Williams2011-08-311-1/+1
* | | | CookieJar is enumerable. fixes #2795Aaron Patterson2011-09-011-0/+5
* | | | Merge pull request #2718 from dasch/patch-5Vijay Dev2011-09-011-1/+4
|\ \ \ \
| * | | | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
* | | | | assets:precompile should not append asset digests when config.assets.digest i...Sam Pohlenz2011-09-011-4/+5
* | | | | Move references to Rails.application.config out of Sprockets AssetPathsSam Pohlenz2011-09-011-5/+14
* | | | | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-311-20/+13
| |/ / / |/| | |
* | | | Set default location of manifest with config.assets.manifestGuillermo Iguaran2011-08-312-2/+9
* | | | Backport f443f9cb0c64 to masterGuillermo Iguaran2011-08-313-28/+13
* | | | Read digests of assets from manifest.yml if config.assets.manifest is onGuillermo Iguaran2011-08-313-2/+31
* | | | Always enable digest and compile in the Rake taskGuillermo Iguaran2011-08-311-2/+3
* | | | Revert "Merge pull request #2647 from dmathieu/no_rescue"Santiago Pastorino2011-08-301-2/+6
* | | | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
* | | | Avoid extra recursive call in Sprockets helpersGuillermo Iguaran2011-08-281-2/+2
* | | | Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
|/ / /
* | | deletes spurious arrowXavier Noria2011-08-271-1/+1
* | | doc fixesVijay Dev2011-08-282-12/+16
* | | Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpersSantiago Pastorino2011-08-251-4/+4
|\ \ \
| * | | Removing redundant stringify_keys in Sprockets helpersGuillermo Iguaran2011-08-251-4/+4
* | | | Don't require a specific value for the ?debug flagDaniel Schierbeck2011-08-251-3/+1
|/ / /
* | | Merge pull request #2690 from dasch/pretty-debug-assetsAaron Patterson2011-08-251-4/+4
|\ \ \
| * | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readableDaniel Schierbeck2011-08-251-4/+4
* | | | Tiny refactorSantiago Pastorino2011-08-251-4/+7
* | | | Merge pull request #2491 from waynn/fix_symbolSantiago Pastorino2011-08-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix destructive stringify_keys for label_tagWaynn Lue2011-08-111-2/+2
* | | | stop circular require warningsAaron Patterson2011-08-241-1/+0
* | | | Preserve stylesheet_link_tag and javascript_include_tag options on debugGuillermo Iguaran2011-08-241-4/+3
* | | | Use super in javascript_include_tag and stylesheet_link_tag instead of genera...Guillermo Iguaran2011-08-241-14/+2