aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11673 from ↵Rafael Mendonça França2013-07-301-1/+1
|\ | | | | | | | | jetthoughts/11671_describe_access_to_helpers_from_controller Improve documentation for controller how to get included helpers
| * Improve documentation for controller how to get included helpers [ci skip]Paul Nikitochkin2013-07-301-1/+1
| | | | | | | | Closes #11671
* | Merge pull request #11672 from henrikhodne/patch-1Rafael Mendonça França2013-07-301-1/+1
|\ \ | |/ |/| Add retry to `gem install bundler` for Travis
| * Add retry to `gem install bundler` for TravisHenrik Hodne2013-07-301-1/+1
|/ | | This adds the retry behaviour used for other commands to the bundler installation.
* Merge pull request #11664 from thedarkone/digestor-thread-safetyRafael Mendonça França2013-07-301-9/+29
|\ | | | | AV::Digestor thread safety fixes
| * AV::Digestor thread safety fixes.thedarkone2013-07-301-9/+29
|/ | | | | This fixes potential thread safety issues introduced in 09f6fe1. The problem with the original code was that the "recursion-stopping" `nil` values could be seen by other threads.
* Don't mutate the original inflections instance in the testsAndrew White2013-07-302-20/+22
|
* Add CHANGELOG entry for inflection removalAndrew White2013-07-301-0/+4
|
* Don't have a cow, man!Andrew White2013-07-301-1/+0
| | | | | | | Remove cow => kine from default inflections but leave the test case in place to prevent regression of the [old Trac ticket 4929][1]. [1]: http://web.archive.org/web/20090314050915/http://dev.rubyonrails.org/ticket/4929
* Merge branch 'revert-order-prepending'Rafael Mendonça França2013-07-308-21/+34
|\ | | | | | | | | Conflicts: activerecord/CHANGELOG.md
| * Revert change on ActiveRecord::Relation#order method that prepends newRafael Mendonça França2013-07-298-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order on the old ones The previous behavior added a major backward incompatibility since it impossible to have a upgrade path without major changes on the application code. We are taking the most conservative path to be consistent with the idea of having a smoother upgrade on Rails 4. We are reverting the behavior for what was in Rails 3.x and, if needed, we will implement a new API to prepend the order clauses in Rails 4.1.
* | Merge pull request #10673 from sgrif/masterRafael Mendonça França2013-07-295-35/+98
|\ \ | |/ |/| Add ability to specify how a class is converted to Arel predicate when passed to where
| * Add ability to specify how a class is converted to Arel predicatesgrif2013-07-285-35/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability for rails apps or gems to have granular control over how a domain object is converted to sql. One simple use case would be to add support for Regexp. Another simple case would be something like the following: class DateRange < Struct.new(:start, :end) def include?(date) (start..end).cover?(date) end end class DateRangePredicate def call(attribute, range) attribute.in(range.start..range.end) end end ActiveRecord::PredicateBuilder.register_handler(DateRange, DateRangePredicate.new) More complex cases might include taking a currency object and converting it from EUR to USD before performing the query. By moving the existing handlers to this format, we were also able to nicely refactor a rather nasty method in PredicateBuilder.
* | only calculate the klass onceAaron Patterson2013-07-291-1/+2
| |
* | Merge pull request #11358 from Alamoz/asset_pipelineXavier Noria2013-07-291-229/+537
|\ \ | | | | | | Update of 'The Asset Pipeline' guide for Rails 4.
| * | Update of 'The Asset Pipeline' guide for Rails 4. [ci skip]Adrien Lamothe2013-07-261-229/+537
| | |
* | | Merge pull request #10879 from makaroni4/masterAndrew White2013-07-296-0/+50
|\ \ \ | | | | | | | | Added Time#middle_of_day method
| * | | Added Time#middle_of_dayAnatoli Makarevich2013-07-286-1/+51
| | | | | | | | | | | | | | | | Added middle_of_day method to Date and DateTime
* | | | Merge pull request #11654 from robin850/freebsdXavier Noria2013-07-291-0/+28
|\ \ \ \ | | | | | | | | | | Add installation instructions for FreeBSD [ci skip]
| * | | | Add installation instructions for FreeBSD [ci skip]Robin Dupret2013-07-291-0/+28
| | | | | | | | | | | | | | | | | | | | Add packages required to setup the rails environment on FreeBSD.
* | | | | Merge pull request #11651 from ↵Carlos Antonio da Silva2013-07-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/log_should_mimick_original_log_method interceptor should mimick original method
| * | | | | interceptor should mimick original methodNeeraj Singh2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fix also makes the test order independent.
* | | | | | Merge pull request #11653 from ankit8898/typoCarlos Antonio da Silva2013-07-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fixing the broken URL [skip ci]
| * | | | | Fixing the broken URL [skip ci]Ankit Gupta2013-07-291-1/+1
|/ / / / /
* | | | | Fix handling of offsets with Time#to_s(:iso8601)Andrew White2013-07-297-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a lambda to ensure that the generated string respects the offset of the time value. Also add DateTime#to_s(:iso8601) and Date#to_s(:iso8601) for completeness.
* | | | | Merge pull request #11649 from ↵Carlos Antonio da Silva2013-07-291-30/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/use_method_with_active_record_default_timezone use method with_active_record_default_timezone
| * | | | | use method with_active_record_default_timezoneNeeraj Singh2013-07-291-30/+20
| |/ / / /
* | | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-07-291-5/+7
| | | | |
* | | | | Merge pull request #11648 from prathamesh-sonpatki/doc-fixYves Senn2013-07-291-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Improved the doc about showing posts in getting started guide [ci skip]
| * | | | | Improved the doc about showing posts in getting started guide [ci skip]Prathamesh Sonpatki2013-07-291-0/+2
| |/ / / / | | | | | | | | | | | | | | | - Reference #11644
* | | | | Merge pull request #11646 from neerajdotname/remove_duplicate_methodYves Senn2013-07-291-7/+0
|\ \ \ \ \ | |/ / / / |/| | | | remove duplicate method
| * | | | remove duplicate methodNeeraj Singh2013-07-291-7/+0
|/ / / / | | | | | | | | | | | | This method is already present in helper.rb
* | | | Add Time#to_s(:iso8601) for easy conversion of times to the iso8601 format ↵David Heinemeier Hansson2013-07-283-1/+7
| | | | | | | | | | | | | | | | for easy Javascript date parsing
* | | | Merge pull request #11608 from arunagw/ruby-from-rubygemsAaron Patterson2013-07-286-12/+6
|\ \ \ \ | |_|_|/ |/| | | grab executable from rubygems
| * | | grab executable from rubygemsArun Agrawal2013-07-266-12/+6
| | | | | | | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* | | | Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails"Akira Matsuda2013-07-291-1/+1
| | | |
* | | | Revert "fix order dependent test related to migration"Akira Matsuda2013-07-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 10259c3e906da2191ef0d43cd664a3b5504d9f8c. reason: this causes rake test_mysql and test_mysql2 fail
* | | | Properly repair validations when dynamically addedAkira Matsuda2013-07-291-24/+30
| | | |
* | | | Clear class ivar before testingAkira Matsuda2013-07-291-0/+2
| | | |
* | | | Unneeded assertionAkira Matsuda2013-07-291-1/+1
| | | |
* | | | Don't rewrite AR connection#commit_db_transaction method globallyAkira Matsuda2013-07-291-4/+4
| | | |
* | | | Merge pull request #11640 from pawel2105/manifest_fixDavid Heinemeier Hansson2013-07-283-6/+14
|\ \ \ \ | | | | | | | | | | Changed stylesheet load order in the stylesheet manifest generator.
| * | | | Changed stylesheet load order in the stylesheet manifest generator.Pawel Janiak2013-07-283-6/+14
| | | | |
* | | | | Merge pull request #11641 from ankit8898/test_cleanupRafael Mendonça França2013-07-282-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Cleanup of class_name
| * | | | | Cleanup of class_nameAnkit Gupta2013-07-282-2/+2
| |/ / / / | | | | | | | | | | | | | | | Don't think class name is needed as by default belongs_to :select will be linked to Select class.
* | | | | Merge pull request #11634 from ↵Rafael Mendonça França2013-07-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration
| * | | | | fix order dependent test related to migrationNeeraj Singh2013-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the order in which tests are executed is changed then test fails. This commit ensures that all migrations are run before ensuring that there are no pending migration.
* | | | | | Merge pull request #11635 from ↵Rafael Mendonça França2013-07-281-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone
| * | | | | | make test order independent by resetting timezoneNeeraj Singh2013-07-281-0/+2
| |/ / / / /
* | | | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_orderRafael Mendonça França2013-07-281-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | reset default timezone and make test order independent