aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove assertion on date from humans.txt testsJosé Valim2012-05-141-1/+1
|
* Remove dates and environment variables from humans.txtJosé Valim2012-05-141-2/+0
|
* Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
|\ | | | | mailer can be anonymous
| * mailer can be anonymousSergey Nartimov2012-05-133-1/+16
| | | | | | | | closes #5970
* | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵José Valim2012-05-142-4/+1
| | | | | | | | AS, closes #6287
* | MySQL doesn't allow default values for blobs.Rafael Mendonça França2012-05-131-2/+2
| |
* | 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
| | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb
* | Copy edit [ci skip]Rafael Mendonça França2012-05-132-3/+5
| |
* | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-135-6/+55
|\ \ | | | | | | Custom coders support for ActiveRecord::Store.
| * | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵Andrey Voronkov2012-05-095-6/+55
| | | | | | | | | | | | used out of the box.
* | | Merge pull request #4431 from lest/refactor-1-9Rafael Mendonça França2012-05-131-7/+3
|\ \ \ | | | | | | | | use const_defined? with second argument in AS::Dependencies
| * | | use const_defined? with second argument in AS::DependenciesSergey Nartimov2012-05-131-7/+3
| | | | | | | | | | | | | | | | there is no need in local_const_defined? helper method
* | | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-132-4/+3
| | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
* | | | Merge pull request #6305 from arunagw/ruby-prof-fixesCarlos Antonio da Silva2012-05-133-2/+3
|\ \ \ \ | | | | | | | | | | Ruby prof fixes
| * | | | Need to include "OutputSaftyHelper" here to preventArun Agrawal2012-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `number_with_delimiter': undefined method `safe_join' for #<ActiveSupport::Testing::Performance::Metrics::Objects
| * | | | Fixed ruby-prof changes and let's use latest ruby-prof now.Arun Agrawal2012-05-132-2/+2
| | | | |
* | | | | Merge pull request #6307 from oscardelben/refactor_app_generator_testCarlos Antonio da Silva2012-05-131-22/+20
|\ \ \ \ \ | | | | | | | | | | | | Refactor App Generator Test
| * | | | | Refactor App Generator TestOscar Del Ben2012-05-131-22/+20
| |/ / / /
* | / / / Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
| |/ / / |/| | |
* | | | Merge pull request #6308 from nashby/blockless-stepJosé Valim2012-05-131-10/+0
|\ \ \ \ | | | | | | | | | | remove useless tests for Range#step
| * | | | remove useless tests for Range#stepVasiliy Ermolovich2012-05-131-10/+0
|/ / / /
* | | | Remove blockless_step leave all that up to RubySantiago Pastorino2012-05-133-15/+1
| | | | | | | | | | | | | | | | Closes #6297
* | | | Remove remaining require 'rubygems'Santiago Pastorino2012-05-135-9/+1
| | | |
* | | | Merge pull request #6303 from korny/remove-require-rubygemsSantiago Pastorino2012-05-139-12/+0
|\ \ \ \ | |/ / / |/| | | require "rubygems" is obsolete in Ruby 1.9.3
| * | | require "rubygems" is obsolete in Ruby 1.9.3Kornelius Kalnbach2012-05-139-12/+0
|/ / /
* | | Merge pull request #6298 from frodsan/fix_todo_skipRafael Mendonça França2012-05-131-9/+8
|\ \ \ | |_|/ |/| | fixme: use minitest skip instead of return nil
| * | fix todo: use minitest skip instead of return nilFrancesco Rodriguez2012-05-131-9/+8
| | |
* | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ | | | | | | | | Use the more idiomatic tap method
| * | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
| | | |
* | | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ \ \ \ | |_|/ / |/| | | Improve and cleanup a bit partial renderer
| * | | Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template
* | | | Copy edit the documentationRafael Mendonça França2012-05-131-1/+1
| | | |
* | | | 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 ↵Rafael Mendonça França2012-05-134-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md
| * | | | Changed the changelog and documentation aboutAngelo Capilleri2012-05-132-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | the select method (tag select) forces :include_blank if is required and no multiple and display size is one
| * | | | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-132-0/+26
| | | | | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908
* | | | | Merge pull request #6193 from mhfs/fix_oracle_specRafael Mendonça França2012-05-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix failing AR test on Oracle
| * | | | | Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147).
* | | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Switch token_tag if block
| * | | | | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
| | | | | |
* | | | | | Remove tailing spaces :scissors: [ci skip]Rafael Mendonça França2012-05-121-1/+1
| | | | | |
* | | | | | Move AS set configs to AS RaitieSantiago Pastorino2012-05-122-11/+8
| | | | | |
* | | | | | Merge pull request #6271 from homakov/patch-5Santiago Pastorino2012-05-121-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | configuration for active_support and JSON Encoding
| * | | | | | Update railties/lib/rails/application/bootstrap.rbEgor Homakov2012-05-111-1/+11
| | | | | | |
* | | | | | | copy-edits a recent CHANGELOG entry [ci skip]Xavier Noria2012-05-121-1/+1
| | | | | | |
* | | | | | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip]
* | | | | | | fixes a nodoc which swallowed the documentation for the rest of the methods ↵Vijay Dev2012-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 11:49:55 +0000