aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-204-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-202-3/+3
|\ | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-202-3/+3
| |
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/| Template concurrency fixes
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
| |
* | Improve docs for `try` by adding note on `BasicObject`Piotr Sarnacki2012-05-201-0/+4
| | | | | | | | [ci skip] closes #5790
* | Fix uniqueness validator with `allow_nil: false` also for mysqlPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | MySQL's adapter was changing value for case sensitive comparison. We don't need to do it for `nil`.
* | Fix `validates_uniqueness_off :field, :allow_nil => false`Piotr Sarnacki2012-05-192-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes (#5853) Uniqueness validator was not properly checking if there are any existing records, when value was `nil` and column was text type. `nil` was converted to string, which resulted in queries looking like: ```sql SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1 ``` instead of ```sql SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1 ```
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-192-10/+10
| | | | | | | | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces.
* | Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
| | | | | | | | Synchronize read and modification of @reserved_connections
* | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
| | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-182-2/+3
| | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
* | Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtmRafael Mendonça França2012-05-181-2/+2
|\ \ | | | | | | Invalid ruby18 syntax in habtm
| * | Fix HABTM syntax error in Ruby 1.8.xErnie Miller2012-05-181-2/+2
|/ /
* | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
| |
* | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-186-9/+48
| | | | | | | | | | | | | | | | Bug #6289 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* | Merge pull request #6377 from ihid/depreciate_old_text_helper_apisRafael Mendonça França2012-05-183-36/+56
|\ \ | | | | | | Deprecate old APIs for highlight, excerpt and word_wrap
| * | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-183-36/+56
|/ /
* | Merge pull request #6367 from frodsan/fix_validators_docsVijay Dev2012-05-179-116/+154
|\ \ | | | | | | Fix validators docs [3-2-stable]
| * | fix validations docsFrancesco Rodriguez2012-05-179-116/+154
|/ /
* | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
| | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* | Merge pull request #6340 from bcardarella/patch-3Aaron Patterson2012-05-161-1/+1
|\ \ | | | | | | Changing the indentation level of the block comment close for Sass
| * | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
|/ / | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | Merge pull request #6329 from acapilleri/backport_dup_validation_3_2Rafael Mendonça França2012-05-151-1/+9
|\ \ | | | | | | Backport dup validation 3 2
| * | add backport for the pull request #6324Angelo Capilleri2012-05-151-1/+9
|/ /
* | 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
|\ \ | | | | | | Dup validation 3 2
| * | clean the errors if an object that includes validations errors is duped,for ↵Angelo capilleri2012-05-152-0/+21
|/ / | | | | | | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
* | Merge pull request #6321 from frodsan/backport_docsVijay Dev2012-05-153-4/+23
|\ \ | | | | | | Backporting docs
| * | 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 ↵Carlos Galdino + Rafael Mendonça França2012-05-145-31/+54
| | | | | | | | `button_to` and `submit_tag` helpers.
* | Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
| | | | | | | | mailer can be anonymous
* | 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
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #6266 from alexeymuranov/remove_unused_private_methodCarlos Antonio da Silva2012-05-131-3/+0
|\ \ | | | | | | Remove unused private method
| * | 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
| | | | | | | | | | | | Support data: url scheme
* | | Merge pull request #6306 from erichmenge/3-2-stable-guide-fixCarlos Antonio da Silva2012-05-131-2/+2
|\ \ \ | | | | | | | | 3 2 stable guide fix [ci skip]
| * | | :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.3
| * | | 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 docs [3-2-stable]
| * | | 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
|\ \ \ | | | | | | | | 3 2 stable guides fix
| * | | Update 'getting started' guides for new whitelist security implementation. ↵Erich Menge2012-05-121-1/+16
|/ / / | | | | | | | | | Closes #6286.
* | | Merge pull request #6262 from arunagw/ruby_prof_fixSantiago Pastorino2012-05-112-2/+2
|\ \ \ | |/ / |/| | Ruby prof fix
| * | Ruby-Prof works with ruby-1.9.3 also.Arun Agrawal2012-05-111-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:02:21 +0000