aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #2974 from md5/csrf_token_warningSantiago Pastorino2011-09-101-1/+1
|\ \ \ | | | | | | | | Use ensure instead of rescue
| * | | Use ensure instead of rescueMike Dillon2011-09-101-1/+1
| | | |
* | | | Merge pull request #2972 from md5/masterAaron Patterson2011-09-103-1/+19
|\| | | | | | | | | | | Use log.warn instead of debug for CSRF token warning
| * | | Fix changelog entryMike Dillon2011-09-101-1/+1
| | | |
| * | | Add test for warning and CHANGELOG entryMike Dillon2011-09-102-0/+18
| | | |
| * | | Change log level for CSRF token verification warningMike Dillon2011-09-101-1/+1
| | | |
* | | | No need to use </form> here. It's already in whole_form blockArun Agrawal2011-09-101-2/+1
|/ / /
* | | Merge pull request #2876 from alex3/patch-1Santiago Pastorino2011-09-091-0/+2
|\ \ \ | |_|/ |/| | Fixed assets precompile regex
| * | Fixed assets precompile regex, now accepts ProcsAlex Yakoubian2011-09-081-0/+2
| | |
* | | Pull up a method we only use once.Aaron Patterson2011-09-081-5/+1
| | |
* | | Conditions must never be equalAaron Patterson2011-09-081-6/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-081-2/+2
|\ \
| * | Fixing `record_key_for_dom_id` documentation. Nicolás Hock Isaza2011-09-071-1/+1
| | | | | | | | | The default implementation joins everything with '_' and not with '-'
| * | Fix grammar for content_tag_for and div_for docs.Hendy Tanata2011-09-051-2/+2
| | |
* | | Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-072-2/+21
|\ \ \ | | | | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.
| * | | fix assert_select_email to work on non-multipart emails as well as ↵Andrew Kaspick2011-08-112-2/+21
| | | | | | | | | | | | | | | | 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-062-1/+9
| |_|/ |/| |
* | | 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-052-1/+13
|\ \ \ \ \ | | | | | | | | | | | | 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-052-1/+13
| | | | | | | | | | | | | | | | | | 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-052-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | current_page? returns false for non-GET requests
| * | | | | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-022-2/+16
| | | | | | |
* | | | | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-052-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given
* | | | | | | add blanks between methodsVijay Dev2011-09-051-0/+3
| |/ / / / / |/| | | | |
* | | | | | Remove empty testSantiago Pastorino2011-09-051-3/+0
| | | | | |
* | | | | | Merge pull request #2863 from ↵Santiago Pastorino2011-09-041-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings
| * | | | | | Tests shouldn't produce warningsRay Baxter2011-09-041-0/+5
| | | | | | |
* | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLogGuillermo Iguaran2011-09-041-0/+3
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #2860 from guilleiguaran/fix-assets-behaviorSantiago Pastorino2011-09-041-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix AssetNotPrecompiledError behavior
| * | | | | | 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
* / / / / / * is not allowed in windows file names. Closes #2574 #2847Santiago Pastorino2011-09-042-1/+1
|/ / / / /
* | / / / if ... nil? is more expensive than unlessMilan Dobrota2011-09-047-11/+11
| |/ / / |/| | |
* | | | Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-043-7/+89
|\ \ \ \ | | | | | | | | | | 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-043-7/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #2835 from guilleiguaran/actionpack-changelogSantiago Pastorino2011-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | Include ticket numbers in AP CHANGELOG
* | | | | 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-013-0/+23
| | | |
* | | | 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
* | | | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-masterJosé Valim2011-09-011-1/+10
|\ \ \ \ \ | | | | | | | | | | | | Add missing changelog entries for 3.1.1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 09:39:31 +0000