aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | fix assert_select_email to work on non-multipart emails as well as ↵Andrew Kaspick2011-08-111-2/+2
| | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors.
* | | | Nicolás Hock Isaza2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-'
* | | | 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 double slash at start of paths when mounting an engine at the root.
| * | | Fix bug #2579.rails-noob2011-09-061-1/+3
| | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-061-1/+1
|\ \ \ \ | | | | | | | | | | config.action_controller.perform_caching isn't used anymore in asset pipeline
| * | | | config.action_controller.perform_caching isn't used anymore in assets ↵Guillermo Iguaran2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | pipeline, instead we are using config.assets.digest now
* | | | | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ \ \ \ | | | | | | | | | | | | No need to use a begin block there
| * | | | | 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_safe
| * | | | | Make sure that result from content_tag_for with collection is html_safePrem Sichanugrist2011-09-051-1/+1
| | |/ / / | |/| | | | | | | | Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
* | | | | Merge pull request #2815 from avakhov/current-page-non-get-requestsSantiago Pastorino2011-09-051-0/+8
|\ \ \ \ \ | | | | | | | | | | | | current_page? returns false for non-GET requests
| * | | | | 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
| |/ / / / |/| | | | | | | | | | | | | | Never return stored content from content_for when a block is given
* | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵Guillermo Iguaran2011-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | config.assets.compile = false and manifest file isn't present
* | | | | 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 records
| * | | | Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-041-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end
* | | | | 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
| * | | | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
| | | | | | | | | | | | | | | This makes the code more readable.
* | | | | assets:precompile should not append asset digests when config.assets.digest ↵Sam Pohlenz2011-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | is false
* | | | | 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
| |/ / / |/| | | | | | | | | | | Assets pipeline: fix in manifest location and remove unused code
* | | | 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
| | | | | | | | | | | | | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
* | | | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | Add documentation to Sprockets::NullCompressor and Sprockets::LazyCompressor. Also, make LazyCompressor#compressor private, as it isn't part of the public API.
* | | | 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 helpers
| * | | 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
|/ / / | | | | | | | | | | | | Previously, only "1" and "true" were accepted. This change makes any value, or no value at all, have the same effect.
* | | Merge pull request #2690 from dasch/pretty-debug-assetsAaron Patterson2011-08-251-4/+4
|\ \ \ | | | | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
| * | | 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_tag
| * | | 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 ↵Guillermo Iguaran2011-08-241-14/+2
| | | | | | | | | | | | | | | | generate tags manually
* | | | Remove redundant join and call to html_safeGuillermo Iguaran2011-08-241-2/+2
| | | |