aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Fix indent from previous mergeCarlos Antonio da Silva2012-05-151-2/+2
* | Merge pull request #6324 from acapilleri/dup_validation_3_2Rafael Mendonça França2012-05-152-0/+21
|\ \
| * | clean the errors if an object that includes validations errors is duped,for 3...Angelo capilleri2012-05-152-0/+21
|/ /
* | Merge pull request #6321 from frodsan/backport_docsVijay Dev2012-05-153-4/+23
|\ \
| * | Backporting some docs on core_ext/hashFrancesco Rodriguez2012-05-153-4/+23
|/ /
* | Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-145-9/+20
* | Fix typoCarlos Galdino + Rafael Mendonça França2012-05-143-10/+10
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for `butto...Carlos Galdino + Rafael Mendonça França2012-05-145-31/+54
* | Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
* | Default escape_html_entities_in_json to true in new appsJosé Valim2012-05-141-2/+2
* | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-141-0/+3
* | Merge pull request #6266 from alexeymuranov/remove_unused_private_methodCarlos Antonio da Silva2012-05-131-3/+0
|\ \
| * | Remove unused private method yaml_fixtures_keyAlexey Muranov2012-05-111-3/+0
* | | Deprecate `:mouseover` options for `image_tag` helper.Rafael Mendonça França2012-05-133-8/+44
* | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
* | | Merge pull request #6306 from erichmenge/3-2-stable-guide-fixCarlos Antonio da Silva2012-05-131-2/+2
|\ \ \
| * | | :foreign_key option should be on has_many side of associationMikhail Dieterle2012-05-131-2/+2
* | | | Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stableSantiago Pastorino2012-05-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade sprockets to 2.1.3Guillermo Iguaran2012-05-131-1/+1
|/ / /
* | | Merge pull request #6294 from frodsan/docs_backportVijay Dev2012-05-123-1/+22
|\ \ \
| * | | adding examples and docsFrancesco Rodriguez2012-05-123-1/+22
|/ / /
* | | Merge pull request #6292 from erichmenge/3-2-stable-docfixRafael Mendonça França2012-05-121-1/+16
|\ \ \
| * | | Update 'getting started' guides for new whitelist security implementation. Cl...Erich Menge2012-05-121-1/+16
|/ / /
* | | Merge pull request #6262 from arunagw/ruby_prof_fixSantiago Pastorino2012-05-112-2/+2
|\ \ \ | |/ / |/| |
| * | Ruby-Prof works with ruby-1.9.3 also.Arun Agrawal2012-05-111-1/+1
| * | Update performance profiler to work with latest ruby-profArun Agrawal2012-05-112-2/+2
|/ /
* | Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
* | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+35
* | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
* | Merge pull request #6230 from spectator/active_resource_exceptionsJeremy Kemper2012-05-102-1/+1
|\ \
| * | Make sure TimeoutError is loaded.Yury Velikanau2012-05-102-1/+1
* | | Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fixtures__...Jeremy Kemper2012-05-091-7/+26
|\ \ \
| * | | Remove deprecated use of ::instantiate_fixturesAlexey Muranov2012-05-101-4/+4
| * | | Deprecate ::instantiate_fixtures unused parameterAlexey Muranov2012-05-101-3/+22
* | | | Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicatesSantiago Pastorino2012-05-092-2/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure that javascript_include_tag/stylesheet_link_tag methods inJorge Bejar2012-05-032-2/+8
* | | | Merge pull request #6219 from frodsan/fix_buildPiotr Sarnacki2012-05-091-1/+9
|\ \ \ \
| * | | | Fix buildFrancesco Rodriguez2012-05-091-1/+9
* | | | | Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stableVijay Dev2012-05-091-1/+65
|\ \ \ \ \
| * | | | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #begin...Mark J. Titorenko2012-05-091-0/+6
| * | | | | Bring activesupport CHANGELOG up-to-date/consistent with master.Mark J. Titorenko2012-05-091-1/+59
|/ / / / /
* | | | | Merge pull request #6223 from carlosantoniodasilva/remove-columns-deprecation...Andrew White2012-05-092-4/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Stop showing deprecations for Ruby 1.8.7 with remove_columnCarlos Antonio da Silva2012-05-092-4/+6
|/ / / /
* | | | Merge pull request #6218 from frodsan/fix_docs_32stableVijay Dev2012-05-091-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | fix attribute_accessors docs to support 1.8 syntaxFrancesco Rodriguez2012-05-091-11/+11
|/ / /
* | | Merge pull request #6213 from frodsan/cut_docs_dupVijay Dev2012-05-081-23/+0
|\ \ \
| * | | removing docs duplicationFrancesco Rodriguez2012-05-081-23/+0
|/ / /
* | | Merge pull request #6211 from frodsan/docs_attr_accessor_32stableVijay Dev2012-05-081-0/+111
|\ \ \
| * | | added docs to attribute_accessors methodsFrancesco Rodriguez2012-05-081-0/+111
| |/ /
* | | Merge pull request #6200 from arunagw/3-2-stableSantiago Pastorino2012-05-081-1/+1
|\ \ \