aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Make url_for work when option is nil and default_url_options hasRafael Mendonça França2012-04-051-1/+1
| | | | stringified keys
* Fix url_for when options is nilRafael Mendonça França2012-04-051-1/+1
| | | | | RouteSet#url_for was modifying the options hash that belong to the caller
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-051-0/+1
|\
| * Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
| |
* | Merge pull request #5182 from castlerock/content_tag_instead_stringXavier Noria2012-04-051-2/+2
|\ \ | | | | | | content_tag used instead string for option
| * | content_tag used instead string for optionVishnu Atrai2012-02-261-2/+2
| | |
* | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-051-2/+13
|\ \ \ | | | | | | | | mo fasta and mo betta the url_for
| * | | url_for: avoid a nil check. unroll a loop. handle most common case 1st.ara.t.howard2012-04-051-18/+13
| | | |
| * | | carefully and quickly merge url_for optionsara.t.howard2012-04-041-1/+17
| | | |
* | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\ \ \ \ | | | | | | | | | | removed unnecessary block when using fetch
| * | | | removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
| | | | |
* | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | prevent the cache sweeper ignores NoMethodError
| * | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-291-1/+1
| | | | |
* | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-046-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Updated/changed unneeded tr/gsubs
| * | | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-036-8/+8
| | |/ / / | |/| | |
* | | | | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-042-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile
| * | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| | | | |
| * | | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
| | | | |
* | | | | minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
| |/ / / |/| | |
* | | | add type option to atom feed entry builderSergey Nartimov2012-04-011-1/+4
| | | | | | | | | | | | | | | | closes #5672
* | | | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \ \ \ | |/ / / |/| | | Tidy up cookies.rb a bit
| * | | Useless/Confusing method definition removedhardi2012-04-011-4/+0
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-013-3/+2
|\ \ \ \
| * | | | :success includes the whole 200 range, not just 200.Erich Menge2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | # File lib/rack/response.rb, line 114 114: def successful?; @status >= 200 && @status < 300; end
| * | | | CSRF messages are no longer controlled by 422.html because ↵Tony Primerano2012-03-281-1/+0
| | | | | | | | | | | | | | | | | | | | InvalidAuthenticityToken is not raised
| * | | | Fix quotes at select_tag examplesAnderson Dias2012-03-281-1/+1
| | | | |
* | | | | Small #label method refactoring, thanks @rafaelfrancaAlexey Vakhov2012-04-011-3/+2
| | | | |
* | | | | Block version of label should wrapped in field_with_errors in case of errorAlexey Vakhov2012-04-011-1/+2
| |/ / / |/| | |
* | | | Remove not needed requiresSantiago Pastorino2012-03-311-1/+0
| | | |
* | | | Merge pull request #5664 from lest/patch-1Piotr Sarnacki2012-03-311-2/+2
|\ \ \ \ | | | | | | | | | | use `symbolize_keys` instead of `dup.symbolize_keys!`
| * | | | use `symbolize_keys` instead of `dup.symbolize_keys!`Sergey Nartimov2012-03-301-2/+2
| | | | |
* | | | | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
| | | | |
* | | | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
| | | | |
* | | | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-301-0/+1
|/ / / /
* | | | Merge pull request #5625 from ↵José Valim2012-03-282-3/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace
| * | | | Make controller namespace partial prefix optionalGrant Hutchins2012-03-282-3/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController.
* | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-282-1/+2
|\ \ \ \ | |/ / / |/| | | Missed commits from 3-2-stable
| * | | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-281-1/+1
| | | |
| * | | Add a test case for layout nil.José Valim2012-03-281-0/+1
| | | |
* | | | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-2/+2
|/ / / | | | | | | | | | Closes #5632
* | | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-1/+1
| | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* | | config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-282-2/+2
| | | | | | | | | | | | | | | | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options
* | | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-282-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) Conflicts: actionpack/CHANGELOG.md
* | | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-271-3/+3
|\ \ \ | | | | | | | | Fix label_tag to merge the options hash with the object hash
| * | | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5615
| * | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵Andrey Samsonov2012-03-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't call for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-masterSantiago Pastorino2012-03-272-2/+6
|\ \ \ \ | | | | | | | | | | Don't break Haml with textarea newline fix. (master)
| * | | | Don't break Haml with textarea newline fix.James Coleman2012-03-272-2/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
* / | | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-271-1/+1
|/ / / | | | | | | | | | | | | if you want to read the file you may need to ask if there is something to read from