aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
* Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_...Carlos Galdino + Rafael Mendonça França2012-05-145-55/+11
* Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-133-21/+3
* Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
* Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-1/+1
* Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
* Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\
| * Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
* | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-132-3/+10
* | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-132-1/+7
* | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-133-17/+25
* | Merge pull request #6225 from acapilleri/select_with_required_true_include_fi...Rafael Mendonça França2012-05-133-0/+29
|\ \
| * | Changed the changelog and documentation aboutAngelo Capilleri2012-05-131-0/+3
| * | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-132-0/+26
* | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ | |_|/ |/| |
| * | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
* | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-121-42/+44
|\ \ \
| * | | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
* | | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
* | | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-121-2/+2
* | | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \ \ \
| * | | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
* | | | | mispelling error in actionpach changelogangelo giovanni capilleri2012-05-121-1/+1
* | | | | Add test directory to TestTask's libsSantiago Pastorino2012-05-111-0/+1
* | | | | Remove useless load path modificationsSantiago Pastorino2012-05-114-18/+0
* | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
* | | | | Move require to where it's neededSantiago Pastorino2012-05-116-3/+6
* | | | | Remove ruby/shimSantiago Pastorino2012-05-112-2/+1
* | | | | Copy literal route constraints to defaults - fixes #3571 and #6224.Andrew White2012-05-114-3/+69
* | | | | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+36
* | | | | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
* | | | | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_ac...Rafael Magana2012-05-101-1/+1
* | | | | removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
| |_|_|/ |/| | |
* | | | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-05-092-11/+16
* | | | Fix bug when url_for changes controller.Nikita Beloglazov2012-05-092-2/+11
* | | | fix a couple of formatting issues [ci skip]Vijay Dev2012-05-091-2/+4
* | | | update some examples in asset tag helper docs [ci skip]Vijay Dev2012-05-091-15/+15
* | | | remove redundant and stray line [ci skip]Vijay Dev2012-05-091-2/+0
| |/ / |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-085-105/+180
|\ \ \
| * | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i...Mark J. Titorenko2012-05-081-92/+161
| * | | Add example for image_submit_tag with confirmation. [ci skip]Edward Tsech2012-05-081-0/+3
| * | | Add annotaion for class_eval in AbstractController#helper_method [ci skip]Edward Tsech2012-05-081-3/+3
| * | | Improve readability of metaprogramming annotations at AbstractController call...Edward Tsech2012-05-081-10/+10
| * | | Added reference to I18n.localize, as discussed here:Ernesto Tagwerker2012-05-041-0/+3
* | | | Add failing test re #3436 which demonstrates content_type is not respected wh...Kunal Shah2012-05-081-0/+21
* | | | If content_type is explicitly passed to the :head method use the value or fal...Kunal Shah2012-05-081-1/+2
* | | | Add passing tests for generating URLs with nested SCRIPT_NAMEsJeremy Kemper2012-05-072-3/+17
* | | | Merge pull request #5368 from andhapp/remove-max-staleJosé Valim2012-05-071-4/+4
|\ \ \ \
| * | | | Removed max-stale from the tests since it's a request cache-control directive...Anuj Dutta2012-03-101-4/+4