Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations | Rafael Mendonça França | 2012-06-24 | 2 | -6/+22 | |
|\ \ | | | | | | | Stop assuming strings for grouped calculations | |||||
| * | | Stop assuming strings for grouped calculations | Ernie Miller | 2012-06-24 | 2 | -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-paramify | Carlos Antonio da Silva | 2012-06-23 | 2 | -1/+8 | |
|\ \ | | | | | | | Don't paramify ActionDispatch::Http::UploadedFile in tests | |||||
| * | | Don't paramify ActionDispatch::Http::UploadedFile in tests | Tim Vandecasteele | 2012-06-22 | 2 | -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_dir | Carlos Antonio da Silva | 2012-06-23 | 4 | -0/+0 | |
|\ \ \ | | | | | | | | | Move Active Record rake tasks tests to under the tasks dir [ci skip] | |||||
| * | | | Move tasks(rake) tests to under the tasks dir. | kennyj | 2012-06-24 | 4 | -0/+0 | |
|/ / / | ||||||
* | | | Merge pull request #6836 from flyerhzm/ruby_19_hash | Carlos Antonio da Silva | 2012-06-23 | 6 | -16/+16 | |
|\ \ \ | | | | | | | | | Ruby 1.9 hash syntax for generated code | |||||
| * | | | ruby 1.9 hash syntax for generated code | Richard Huang | 2012-06-23 | 6 | -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 Dev | 2012-06-23 | 1 | -52/+45 | |
| | | | | ||||||
* | | | | Add test cases for 46492949b8c09f99db78b9f7a02d039e7bc6a702 | Andrew White | 2012-06-23 | 1 | -0/+52 | |
|/ / / | ||||||
* | | | eliminating another string subclass | Aaron Patterson | 2012-06-22 | 1 | -3/+7 | |
| | | | ||||||
* | | | fix some accidental nils | Aaron Patterson | 2012-06-22 | 2 | -3/+3 | |
| |/ |/| | ||||||
* | | Merge pull request #6832 from frodsan/nodoc_patch1 | Rafael Mendonça França | 2012-06-22 | 10 | -12/+11 | |
|\ \ | | | | | | | add :nodoc: to internal implementations [ci skip] | |||||
| * | | add :nodoc: to internal implementations [ci skip] | Francesco Rodriguez | 2012-06-22 | 10 | -12/+11 | |
|/ / | ||||||
* | | Merge pull request #6821 from tonywok/pg_datetime_precision | Rafael Mendonça França | 2012-06-22 | 3 | -0/+87 | |
|\ \ | | | | | | | Allow precision option for postgresql datetimes | |||||
| * | | Allow precision option for postgresql datetimes | Tony Schneider | 2012-06-22 | 3 | -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_param | Rafael Mendonça França | 2012-06-22 | 1 | -2/+2 | |
|\ \ | | | | | | | change param name to improve documentation | |||||
| * | | change param name to improve documentation | Francesco Rodriguez | 2012-06-22 | 1 | -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/docrails | Vijay Dev | 2012-06-22 | 16 | -151/+340 | |
|\ \ | ||||||
| * | | fixes a few mistakes in api docs [ci skip] | Vijay Dev | 2012-06-22 | 6 | -9/+7 | |
| | | | ||||||
| * | | copy edit the assets guide[ci skip] | Vijay Dev | 2012-06-22 | 1 | -17/+6 | |
| | | | ||||||
| * | | update ActiveModel::Callbacks documentation [ci skip] | Francesco Rodriguez | 2012-06-22 | 1 | -24/+26 | |
| | | | ||||||
| * | | add description to ActiveModel::MissingAttributeError [ci skip] | Francesco Rodriguez | 2012-06-21 | 1 | -1/+2 | |
| | | | ||||||
| * | | add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci ↵ | Francesco Rodriguez | 2012-06-21 | 1 | -0/+26 | |
| | | | | | | | | | | | | skip] | |||||
| * | | add docs to AM::AttributeMethods#define_attribute_method [ci skip] | Francesco Rodriguez | 2012-06-21 | 1 | -0/+25 | |
| | | | ||||||
| * | | fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip] | Francesco Rodriguez | 2012-06-21 | 1 | -7/+20 | |
| | | | ||||||
| * | | update ActiveModel::AttributeMethods documentation [ci skip] | Francesco Rodriguez | 2012-06-21 | 1 | -27/+20 | |
| | | | ||||||
| * | | Small typo in Backporting instructions. | Godfrey Chan | 2012-06-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | just specify what's to be done, not what's not to be. | Damien Mathieu | 2012-06-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix delivery_method usage | Ben Oakes | 2012-06-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | switch to prototype also modifies application.js [ci skip] | Francesco Rodriguez | 2012-06-20 | 1 | -1/+9 | |
| | | | ||||||
| * | | remove deprecated methods [ci skip] | Francesco Rodriguez | 2012-06-19 | 1 | -17/+0 | |
| | | | ||||||
| * | | update Built-in Rails Helpers section [ci skip] | Francesco Rodriguez | 2012-06-19 | 1 | -16/+38 | |
| | | | ||||||
| * | | fix typo [ci skip] | Francesco Rodriguez | 2012-06-19 | 1 | -7/+7 | |
| | | | ||||||
| * | | add documentation to AS::TestCase#assert_nothing_raised | Francesco Rodriguez | 2012-06-19 | 1 | -0/+5 | |
| | | | ||||||
| * | | update AS::Testing::Assertions docs | Francesco Rodriguez | 2012-06-19 | 1 | -21/+32 | |
| | | | ||||||
| * | | fix typo [ci skip] | Francesco Rodriguez | 2012-06-19 | 1 | -2/+2 | |
| | | | ||||||
| * | | Typo in documentation. | Andrés Mejía | 2012-06-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | add example to AS::Deprecation#deprecate_methods [ci skip] | Francesco Rodriguez | 2012-06-18 | 1 | -0/+20 | |
| | | | ||||||
| * | | Fix misprint in UrlHelper module | Alexey Vakhov | 2012-06-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | Rewrite some parts of the Rails initialization guide | Oscar Del Ben | 2012-06-17 | 1 | -9/+4 | |
| | | | ||||||
| * | | Add initialization section | Oscar Del Ben | 2012-06-17 | 1 | -0/+5 | |
| | | | ||||||
| * | | Rewrite rails command section | Oscar Del Ben | 2012-06-17 | 1 | -2/+2 | |
| | | | ||||||
| * | | Add tip for browsing source code on Github | Oscar Del Ben | 2012-06-17 | 1 | -0/+5 | |
| | | | ||||||
| * | | Not focusing on Passenger for now | Oscar Del Ben | 2012-06-17 | 1 | -2/+4 | |
| | | | ||||||
| * | | add example to AS::Deprecation#silence [ci skip] | Francesco Rodriguez | 2012-06-17 | 1 | -1/+10 | |
| | | | ||||||
| * | | change not valid syntax [ci-skip] | Francesco Rodriguez | 2012-06-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | fix example with data: { disable-with: '' } [ci skip] | Francesco Rodriguez | 2012-06-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | update DOM and HTML vs AJAX communication [ci skip] | Gustavo Beathyate | 2012-06-16 | 1 | -2/+12 | |
| | | | ||||||
| * | | unnecessary reference to link_to_remote method in rails 4.0 [ci skip] | Francesco Rodriguez | 2012-06-16 | 1 | -23/+30 | |
| | | |