aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fbRafael Mendonça França2012-06-261-1/+0
|
* Merge pull request #6859 from bogdan/deprecate_monkey_patchJosé Valim2012-06-265-1/+23
|\ | | | | AS::Callbacks: deprecate monkey patch code
| * AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-265-1/+23
| | | | | | | | | | Deprecate usage of filter object with #before and #after methods as around callback
* | Merge pull request #6858 from amatsuda/av_no_such_method_update_detailsJosé Valim2012-06-261-2/+1
|\ \ | | | | | | :update_details method no more exists on @lookup_context
| * | :update_details method no more exists on @lookup_contextAkira Matsuda2012-06-261-2/+1
| |/ | | | | | | the method has gone in this commit: 119e9e2dafb0cdc5b85613b730333679aef534af
* | Merge pull request #6839 from bcardarella/async-actionmailerAaron Patterson2012-06-268-0/+86
|\ \ | |/ |/| Async actionmailer
| * Some final syntax fixesBrian Cardarella2012-06-242-3/+2
| |
| * Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-2/+2
| |
| * Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-0/+4
| |
| * Forcing the message sending is no longer necessaryBrian Cardarella2012-06-242-16/+1
| |
| * Support for custom queues on the mailerBrian Cardarella2012-06-233-18/+30
| | | | | | | | Credit goes to *Aaron Patterson* (tenderlove)
| * Removed unecessary splattingBrian Cardarella2012-06-231-1/+1
| |
| * Use Delegator for a cleaner QueuedMessage classBrian Cardarella2012-06-231-13/+8
| | | | | | | | Credit goes to *Nicolás Sanguinetti* (foca) for this suggestion
| * Updated ChangelogsBrian Cardarella2012-06-232-0/+5
| |
| * Force message delivery despite asyncBrian Cardarella2012-06-232-2/+16
| |
| * Add commented out ActionMailer async config optionBrian Cardarella2012-06-231-0/+3
| |
| * AsyncMailer documentionBrian Cardarella2012-06-232-0/+3
| |
| * Asynchronous ActionMailerBrian Cardarella2012-06-235-0/+66
| | | | | | | | | | | | | | | | Any ActionMailer class can be set to render and delier messages using the new Rails Queue. Some of this work was borrowed (with permission) from Nick Plante's (zapnap) reqsue_mailer gem.
* | Use args.flatten! in query methods when applicableCarlos Antonio da Silva2012-06-251-7/+12
| | | | | | | | | | Try to use more destructive methods on *args when applicable, to avoid creating new objects.
* | Merge pull request #6544 from flexoid/issue-6431Piotr Sarnacki2012-06-253-6/+14
|\ \ | | | | | | exists?(false) returns false
| * | exists?(false) returns falseEgor Lynko2012-06-253-6/+14
| | | | | | | | | | | | `FinderMethods#exists?` finder method now returns *false* with the *false* argument
* | | Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-9/+13
| | | | | | | | | | | | Fix build issue with postgresql.
* | | Merge pull request #6857 from rsutphin/as_core_ext_time_missing_requireCarlos Antonio da Silva2012-06-251-0/+1
|\ \ \ | | | | | | | | Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
| * | | Add missing require.Rhett Sutphin2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you selectively require core_exts (e.g., require 'active_support/core_ext/string'), it is possible for 'active_support/core_ext/time/calculations' to be required when `ActiveSupport::TimeWithZone` is not available. If this happens, the next call to Time.=== will fail with a NameError.
* | | | Merge pull request #6855 from kennyj/refactor_database_tasksRafael Mendonça França2012-06-252-21/+46
|\ \ \ \ | |/ / / |/| | | Refactor and improve database tasks.
| * | | Move to db:structure namespace, because these methods are global.kennyj2012-06-261-8/+9
| | | |
| * | | Remove session_table_name method because this is global and used only once.kennyj2012-06-261-5/+1
| | | |
| * | | Add a description about ENV["SCOPE"]kennyj2012-06-261-1/+1
| | | |
| * | | Change the behavior of db:test:prepare task when schema_format is sql for ↵kennyj2012-06-262-1/+10
| | | | | | | | | | | | | | | | consistency.
| * | | Change the behavior of db:test:clone task when schema_format is sql for ↵kennyj2012-06-262-1/+20
| | | | | | | | | | | | | | | | consistency.
| * | | Change an order of methods for readbility.kennyj2012-06-261-7/+7
| | | |
* | | | Merge pull request #6853 from frodsan/nodoc_patch2Rafael Mendonça França2012-06-2510-19/+19
|\| | | | | | | | | | | add :nodoc: to internal implementations [ci skip]
| * | | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-2510-19/+19
|/ / /
* / / Make internal callback model definitions private in AMoCarlos Antonio da Silva2012-06-251-5/+7
|/ / | | | | | | | | | | | | These _define class methods don't need to be exposed to objects that extend ActiveModel::Callbacks. Also use merge! options to avoid the creation of an extra hash.
* | Rails 4 will be 1.9.3+ only [ci skip]Rafael Mendonça França2012-06-251-9/+3
| |
* | Revert "Merge pull request #6344"Piotr Sarnacki2012-06-254-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit needs to be reverted because it introduces difficulties when using sqlite3 in development and other databases in production. This happens because when you create time column in sqlite3, it's dumped as datetime in schema.rb file. This reverts commit 57d534ee9e441d078fcc161c0c78ebaa5aacd736, reversing changes made to 20f049fb50daee0c5e5a69b55b529af5737e8e3f. Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
* | Merge branch 'number-helpers-refactor'Carlos Antonio da Silva2012-06-245-190/+159
|\ \ | | | | | | | | | Refactor and improve a bit number helpers code.
| * | Get rid of the clear_i18n hack by using a different localeCarlos Antonio da Silva2012-06-241-20/+10
| | | | | | | | | | | | | | | Use a different and very specific locale for testing currency negative format, and an empty store for currency defaults.
| * | Move number helper i18n related tests to ASCarlos Antonio da Silva2012-06-242-122/+124
| | | | | | | | | | | | | | | They also make more sense here since all the related logic with I18n is handled by AS::NumberHelper, and not by AV anymore.
| * | Refactor AV number helper tests with invalid numbersCarlos Antonio da Silva2012-06-241-44/+14
| | | | | | | | | | | | | | | | | | Just make use of the returning exception from assert_raise, instead of calling the method again with a rescue clause to test the saved exception number.
| * | Move constants to the top, remove freezeCarlos Antonio da Silva2012-06-241-5/+5
| | |
| * | Do not propagate the :raise option to AS number helpersCarlos Antonio da Silva2012-06-241-7/+19
| | | | | | | | | | | | | | | ActiveSupport::NumberHelper does not make use of :raise, so there's no need to propagate it down.
| * | Remove some not used variables and improve code a bitCarlos Antonio da Silva2012-06-241-12/+7
|/ /
* | Merge pull request #6847 from benolee/patch-1Carlos Antonio da Silva2012-06-241-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Correct line numbers for reader and writer methods in AS configurable The line number for the reader method is off by one due to the local variable line being reassigned to the writer's line. This commit would provide correct line numbers for backtraces and method introspection (for example, method(:reader).source_location).
| * | correct line numbers for reader and writer methodsbenolee2012-06-241-6/+6
|/ /
* | Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
|\ \ | | | | | | Stop assuming strings for grouped calculations
| * | Stop assuming strings for grouped calculationsErnie Miller2012-06-242-6/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute_grouped_calculation is one of those places where ActiveRecord forgets that it has ARel underpinnings, and assumes that the values provided to group_values are strings. This artificially hobbles otherwise functional code. This patch stops assuming that incoming values respond to to_sym, stops using string interpolation for table aliases on objects that support aliasing, and stops unnecessarily joining group_values on the relation. Additionally, it calls to_sql, if available, on objects sent to column_alias_for, in order to get a more reasonable alias string than a non-string's default to_str method.
* | Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramifyCarlos Antonio da Silva2012-06-232-1/+8
|\ \ | | | | | | Don't paramify ActionDispatch::Http::UploadedFile in tests
| * | Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-06-222-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* | | Merge pull request #6837 from kennyj/move_to_tasks_dirCarlos Antonio da Silva2012-06-234-0/+0
|\ \ \ | | | | | | | | Move Active Record rake tasks tests to under the tasks dir [ci skip]