aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #11701 from morgoth/link-fix-in-guidesJosé Valim2013-08-011-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Added missing closing bracket for markdown url in guides [ci skip]
| * | | | | | Added missing closing bracket for markdown url in guides [ci skip]Wojciech Wnętrzak2013-08-011-1/+1
|/ / / / / /
* | | | | | Merge pull request #11689 from arunagw/readme-updated-avCarlos Antonio da Silva2013-07-312-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moved README into action_view [ci skip]
| * | | | | | Moved README into action_view [ci skip]Arun Agrawal2013-07-312-5/+5
| | | | | | |
* | | | | | | oops! :bomb:Aaron Patterson2013-07-311-1/+1
| | | | | | |
* | | | | | | do is_a? tests on assignment so runtime is fasterAaron Patterson2013-07-313-11/+14
| | | | | | |
* | | | | | | Revert "all `scope_chain` methods allocate new arrays, no need to dup"Aaron Patterson2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1468a4b89aa4bca99160bfa03572b2c0ab348db5.
* | | | | | | callback should always have a valueAaron Patterson2013-07-311-1/+1
| | | | | | |
* | | | | | | no need to to_symAaron Patterson2013-07-312-2/+2
| | | | | | |
* | | | | | | pass the mixin in to the code generation methodsAaron Patterson2013-07-313-11/+11
| | | | | | |
* | | | | | | we should not allow invalid objects to be constructedAaron Patterson2013-07-311-1/+2
| | | | | | |
* | | | | | | push some validation up to the factory methodAaron Patterson2013-07-311-4/+5
| | | | | | |
* | | | | | | Merge pull request #11686 from gzohari/pr-refactor-time-datetimeAndrew White2013-07-315-59/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor Date, Time, DateTime timezone methods
| * | | | | | | Refactor Date, Time, DateTime timezone methodsGilad Zohari2013-08-015-59/+55
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar implementations of #in_time_zone exists for Date, Time and DateTime so method is extracted into its own module. Also some logic is extracted into private method.
* / / / / / / use bind values for model typesAaron Patterson2013-07-311-2/+3
|/ / / / / /
* | | | | | Merge pull request #11681 from gzohari/pr-refactor-date-timeAndrew White2013-07-311-10/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove duplication from date_time calculations
| * | | | | | Remove duplication from date_time calculationsGilad Zohari2013-07-311-10/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods: :past? and :future? are already defined identically in date_and_time/calculations.rb which is included in Date. Because DateTime is a subclass of Date, it can call them.
* | | | | | Merge pull request #11678 from vipulnsward/helper_destructiveRafael Mendonça França2013-07-311-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change from `map` => `map!` and `collect!` to save creation of extra array
| * | | | | Change from `map` => `map!` and `collect!` to save creation of extra array.Vipul A M2013-07-311-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #11601 from TylerRick/dont_permanently_silence_all_warningsRafael Mendonça França2013-07-301-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove $VERBOSE = nil from tasks.rb
| * | | | | Remove $VERBOSE = nil from tasks.rbTyler Rick2013-07-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permanently setting $VERBOSE to nil causes unwanted side effects (warnings generated by app code are silenced when triggered by a rake task but visible otherwise). silence_warnings {} would be safer to use here since it resets $VERBOSE back to what it was when the block finishes.
* | | | | | Merge pull request #11606 from vipulnsward/refactor_array_parserRafael Mendonça França2013-07-301-15/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor `ArrayParser`
| * | | | | | Refactor `ArrayParser`Vipul A M2013-07-261-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Constantize parse token * Remove extra param passed to `parse_data`
* | | | | | | Merge pull request #11668 from neerajdotname/make_test_order_independent_2Rafael Mendonça França2013-07-302-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make test order independent
| * | | | | | | assert_no_queries should ignore certain sqlsNeeraj Singh2013-07-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | postgresql test if randomly executed then executes "SHOW max_identifier_length". Hence the need to ignore certain predefined sqls that deal with system calls.
| * | | | | | | assert_no_queries should allow to ignore some queriesNeeraj Singh2013-07-301-2/+3
| | | | | | | |
* | | | | | | | all `scope_chain` methods allocate new arrays, no need to dupAaron Patterson2013-07-301-1/+1
| | | | | | | |
* | | | | | | | 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]