aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-292-3/+14
|\ | | | | Fix Observer by acting on singleton class. Fixes #3505.
| * Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-292-3/+14
| | | | | | | | Also [issue #1034] [pull #6068]
* | Merge pull request #5942 from ↵Aaron Patterson2012-04-297-11/+38
|\ \ | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute
| * | Support i18n attributes for confirmationBrian Cardarella2012-04-243-3/+23
| | |
| * | Reordered changelog entryBrian Cardarella2012-04-231-2/+2
| | |
| * | Updated CHANGELOGBrian Cardarella2012-04-231-0/+2
| | |
| * | confirmation validation error attributeBrian Cardarella2012-04-236-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.
* | | Merge pull request #6067 from Locke23rus/patch-2Aaron Patterson2012-04-291-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoKirill Nikitin2012-04-301-1/+1
| | | |
* | | | Merge pull request #5999 from bogdan/callbacksJeremy Kemper2012-04-291-7/+7
|\ \ \ \ | |/ / / |/| | | AS::Callbacks#run_callbacks optimized to reduce backtrace
| * | | AS::Callbacks optimized to reduce call backtraceBogdan Gusiev2012-04-271-7/+7
| | | |
* | | | Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactorSantiago Pastorino2012-04-294-8/+4
|\ \ \ \ | | | | | | | | | | Remove some warnings and minor refactor in RoutesReloader
| * | | | Refactor RoutesReloader a bit to avoid creating extra hash objectsCarlos Antonio da Silva2012-04-281-3/+2
| | | | |
| * | | | Remove Declarative module extending, it is already part of AS::TestCaseCarlos Antonio da Silva2012-04-281-2/+0
| | | | | | | | | | | | | | | | | | | | Removes method redefined warning.
| * | | | Define only writer method for queue, as reader is declaredCarlos Antonio da Silva2012-04-282-3/+2
| | | | | | | | | | | | | | | | | | | | Remove deprecation warning of method redefined.
* | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+42
| | | | |
* | | | | Merge pull request #6062 from marcandre/tweak_observerAaron Patterson2012-04-292-5/+21
|\ \ \ \ \ | | | | | | | | | | | | Tweak observer
| * | | | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-292-2/+18
| | | | | |
| * | | | | Fix error message:Marc-Andre Lafortune2012-04-281-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | - can pass the class, not the instance - "instance method" is confusing, use "method :instance" instead
* | | | | Merge pull request #6065 from Locke23rus/patch-1Xavier Noria2012-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove repeated word
| * | | | | Remove repeated wordKirill Nikitin2012-04-301-1/+1
|/ / / / /
* | | | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+36
| | | | |
* | | | | Merge pull request #6061 from twinturbo/scaffold-markupPiotr Sarnacki2012-04-291-16/+20
|\ \ \ \ \ | | | | | | | | | | | | Close #3886 - Add THEAD and TBODY to scaffold markup
| * | | | | Close #3886 - Add THEAD and TBODY to scaffold markuptwinturbo2012-04-291-16/+20
|/ / / / /
* | | | | Add failing test case for #6053Andrew White2012-04-291-0/+21
| | | | |
* | | | | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
| | | | |
* | | | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-292-6/+100
|\ \ \ \ \ | | | | | | | | | | | | Change check_box to work inverting the checked and unchecked value
| * | | | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-292-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995
* | | | | | Merge pull request #6006 from ↵José Valim2012-04-296-16/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | carlosantoniodasilva/partial-layout-collection-item Partial layout collection item
| * | | | | | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-293-3/+20
| | | | | | |
| * | | | | | Move layout logic with collection to be handled only with explicit template ↵Carlos Antonio da Silva2012-04-291-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is given Layout is never an available option when rendering with the shortcut `render @collection`.
| * | | | | | Allow access to current object_counter variable from layout when rendering ↵Carlos Antonio da Silva2012-04-293-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | with partial + collection
| * | | | | | Allow layout to access current object being rendered when using render ↵Carlos Antonio da Silva2012-04-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | partial + object
| * | | | | | Allow layout rendering to access current object being rendered when using ↵Carlos Antonio da Silva2012-04-293-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | partial + collection
* | | | | | | Merge pull request #6017 from larzconwell/remove_sanitize_dom_idJeremy Kemper2012-04-291-6/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed the sanitize_dom_id method
| * | | | | | | Removed the sanitize_dom_id method because HTML5 doctype let's us use ↵Larz Conwell2012-04-271-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anything except nothing and whitespace for id's
* | | | | | | | Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-to-reloadJosé Valim2012-04-291-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Removed extraneous .present? check for AR::Base#reload
| * | | | | | | Removed extraneous .present? check for AR::Base#reloadJeremy Friesen2012-04-291-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reloadJosé Valim2012-04-291-1/+7
|\| | | | | | | | |_|/ / / / / |/| | | | | | Removed deprecation warning for #find as a result of AR::Base#reload
| * | | | | | Removed deprecation warning for #find as a result of AR::Base#reloadJeremy Friesen2012-04-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it."
* | | | | | | Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mimetypeJosé Valim2012-04-292-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add changelog entry for jsonp mimetype change, fix failing test
| * | | | | | Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-292-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Fix failing test: Mime::JS generates "text/javascript"
* | | | | | Removed unclear doc in AR querying guide [ci skip]Vijay Dev2012-04-291-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The range example used in array conditions is unclear and talks about the old 'conditions' option. Closes #4943.
* | | | | | Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separatorJosé Valim2012-04-292-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tests for regexp separator in String#truncate
| * | | | | | Tests for regexp separator in String#truncateAlexey Gaziev2012-04-292-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270
* | | | | | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | | | | | |
* | | | | | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silenceJosé Valim2012-04-293-2/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a "silence" behavior to completely turn off deprecation warnings.
| * | | | | | | Add test for default silence and stderr deprecation behaviorsCarlos Antonio da Silva2012-04-281-0/+20
| | | | | | | |
| * | | | | | | Document #behavior= and update CHANGELOGtwinturbo2012-04-282-0/+9
| | | | | | | |
| * | | | | | | Add a "silence" behavior to completely turn off deprecation warnings.Adam Hawkins2012-04-281-2/+3
| | |_|_|/ / / | |/| | | | |