aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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]
| * | Move tasks(rake) tests to under the tasks dir.kennyj2012-06-244-0/+0
|/ /
* | Merge pull request #6836 from flyerhzm/ruby_19_hashCarlos Antonio da Silva2012-06-236-16/+16
|\ \ | | | | | | Ruby 1.9 hash syntax for generated code
| * | ruby 1.9 hash syntax for generated codeRichard Huang2012-06-236-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | app/controllers/application_controller.rb app/views/layouts/application.html.erb config/application.rb config/routes.rb test/performance/browsing_test.rb
* | | format the 4.0 release notes [ci skip]Vijay Dev2012-06-231-52/+45
| | |
* | | Add test cases for 46492949b8c09f99db78b9f7a02d039e7bc6a702Andrew White2012-06-231-0/+52
|/ /
* | eliminating another string subclassAaron Patterson2012-06-221-3/+7
| |
* | fix some accidental nilsAaron Patterson2012-06-222-3/+3
| |
* | Merge pull request #6832 from frodsan/nodoc_patch1Rafael Mendonça França2012-06-2210-12/+11
|\ \ | | | | | | add :nodoc: to internal implementations [ci skip]
| * | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-2210-12/+11
|/ /
* | Merge pull request #6821 from tonywok/pg_datetime_precisionRafael Mendonça França2012-06-223-0/+87
|\ \ | | | | | | Allow precision option for postgresql datetimes
| * | Allow precision option for postgresql datetimesTony Schneider2012-06-223-0/+87
|/ / | | | | | | | | | | | | | | | | | | This patch addresses the difficulty of retrieving datetime fields. By default, the database holds a higher precision than the time as a String. This issue is discussed at length at the following links: - [#3519](https://github.com/rails/rails/issues/3519) - [#3520](https://github.com/rails/rails/issues/3520) Also, kudos to @mattscilipoti
* | Merge pull request #6829 from frodsan/misunderstood_paramRafael Mendonça França2012-06-221-2/+2
|\ \ | | | | | | change param name to improve documentation
| * | change param name to improve documentationFrancesco Rodriguez2012-06-221-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keys of the error messages are actually attribute names. It makes the documentation easier to understand: # Returns +true+ if the error messages include an error for the given # +attribute+, +false+ otherwise. # # person.errors.messages # => { :name => ["can not be nil"] } # person.errors.include?(:name) # => true # person.errors.include?(:age) # => false def include?(attribute) (v = messages[attribute]) && v.any? end
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-2216-151/+340
|\ \
| * | fixes a few mistakes in api docs [ci skip]Vijay Dev2012-06-226-9/+7
| | |
| * | copy edit the assets guide[ci skip]Vijay Dev2012-06-221-17/+6
| | |
| * | update ActiveModel::Callbacks documentation [ci skip]Francesco Rodriguez2012-06-221-24/+26
| | |
| * | add description to ActiveModel::MissingAttributeError [ci skip]Francesco Rodriguez2012-06-211-1/+2
| | |
| * | add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci ↵Francesco Rodriguez2012-06-211-0/+26
| | | | | | | | | | | | skip]
| * | add docs to AM::AttributeMethods#define_attribute_method [ci skip]Francesco Rodriguez2012-06-211-0/+25
| | |
| * | fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip]Francesco Rodriguez2012-06-211-7/+20
| | |
| * | update ActiveModel::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-06-211-27/+20
| | |
| * | Small typo in Backporting instructions.Godfrey Chan2012-06-211-1/+1
| | |
| * | just specify what's to be done, not what's not to be.Damien Mathieu2012-06-201-1/+1
| | |
| * | Fix delivery_method usageBen Oakes2012-06-201-1/+1
| | |
| * | switch to prototype also modifies application.js [ci skip]Francesco Rodriguez2012-06-201-1/+9
| | |
| * | remove deprecated methods [ci skip]Francesco Rodriguez2012-06-191-17/+0
| | |
| * | update Built-in Rails Helpers section [ci skip]Francesco Rodriguez2012-06-191-16/+38
| | |
| * | fix typo [ci skip]Francesco Rodriguez2012-06-191-7/+7
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 19:28:35 +0000