aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Cant use inclusion in commands/application.rb as the frameworks havent all ↵David Heinemeier Hansson2011-04-111-0/+1
| | | | been required yet
* Fix failing test case on masterPrem Sichanugrist2011-04-101-1/+1
| | | | It turned out that I overlook at some replacements ..
* Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-115-6/+10
| | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
* Add support for Object#in? and Object#either? in Active Support [#6321 ↵Prem Sichanugrist, Brian Morearty, John Reitano2011-04-113-0/+74
| | | | | | | | | | | | state:committed] This will allow you to check if an object is included in another object or the list of objects or not. This patch is derived from patch by Brian Morearty and John Reitano on Lighthouse ticket. I've rewrite it and make sure that we support both 'another object' and 'list of objects' version, as it surely be useful to support both.
* added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵Josh Kalderimis2011-04-055-18/+39
| | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Raise on invalid timezoneMarc-Andre Lafortune2011-04-053-14/+39
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-031-1/+1
|\
| * s/ERb/ERB/gAkira Matsuda2011-04-031-1/+1
| | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
* | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-021-2/+0
| |
* | Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-313-36/+0
| |
* | Add using Turn with natural language test case names if the library is ↵David Heinemeier Hansson2011-03-314-17/+44
| | | | | | | | available (which it will be in Rails 3.1) [DHH]
* | require turn only for minitestDavid Heinemeier Hansson2011-03-311-2/+6
| |
* | Use Turn to format all Rails tests and enable the natural language case namesDavid Heinemeier Hansson2011-03-311-0/+5
| |
* | Delegate pending to skip if Minitest is availableDavid Heinemeier Hansson2011-03-301-21/+25
|/
* parse dates to yaml in json arraysDiego Carrion2011-03-222-2/+4
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* test json decoding with time parsing disabled with all backends and respect ↵Diego Carrion2011-03-222-7/+7
| | | | | | ActiveSupport.parse_json_times when converting to yaml Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Revert "It should be possible to use ActiveSupport::DescendantTracker ↵José Valim2011-03-131-9/+7
| | | | | | | | without getting ActiveSupport::Dependencies for free." This reverts commit 46f6a2e3889bae420589f429b09722a37dbdf18d. Caused failures on CI. rake test:isolated on activesupport directory show them.
* Prevent callbacks in child classes from being executed more than once.Rolf Timmermans2011-03-132-1/+31
|
* It should be possible to use ActiveSupport::DescendantTracker without ↵Rolf Timmermans2011-03-131-7/+9
| | | | getting ActiveSupport::Dependencies for free.
* adds a couple of missing AS dependenciesRolf Timmermans2011-03-122-0/+3
|
* Add missing require 'thread' to BufferedLogger.José Valim2011-03-111-0/+1
|
* move the conditional definition of Float#round downXavier Noria2011-03-092-2/+2
| | | | | | | Rails 3 cherry-picks as little as possible from Active Support. In particular the framework requires the files where extensions are exactly defined, rather than convenience entry points like float.rb and friends. Because of that, it is better to define conditionally rather than require conditionally.
* Use Rubys own Float#round method in versions 1.9 and aboveAndrei Kulakov2011-03-101-1/+1
|
* Add better test scenario for around callback return resultsAaron Pfeifer2011-03-081-0/+10
|
* Allow access to a callback event's return result from around callbacksAaron Pfeifer2011-03-082-2/+32
|
* removing stubs. 1.9.3 implements Date.today in C so mocking the return value ↵Aaron Patterson2011-03-071-9/+4
| | | | of Time.now does nothing
* fixing some tests on ruby 1.9.3Aaron Patterson2011-03-071-0/+23
|
* reorganizes the RDoc of Hash#to_paramXavier Noria2011-03-071-6/+14
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-074-8/+7
|\
| * Improved docs for Hash#to_param methodDalibor Nasevic2011-03-061-3/+2
| |
| * more "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-072-4/+4
| | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
| * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
* | do not test explicit equality of predicate methods, they should be allowed ↵Aaron Patterson2011-03-072-8/+4
| | | | | | | | to return truthy or falsey objects
* | refactor calls to to_param in expand_key methodAaron Patterson2011-03-071-9/+10
| |
* | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-079-14/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ...
| * removes merge conflictsXavier Noria2011-03-062-15/+0
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-069-13/+28
| |\
| | * removes Examples headers introduced in 9b96de6Xavier Noria2011-03-061-10/+4
| | | | | | | | | | | | | | | | | | | | | Example headers are discouraged in the API guidelines. Code just flows with the text. They may be good in places where there's a lot of stuff and structure may add clarity
| | * more style changessuchasurge2011-03-062-2/+2
| | |
| | * Some style changessuchasurge2011-03-065-5/+11
| | |
| | * merges railsXavier Noria2011-03-0523-124/+305
| | |\
| | * | Active Support typos.R.T. Lechow2011-03-047-7/+7
| | | |
| | * | Adds link to Object.blank? from Object.present?Jonathon D. Jones2011-03-031-1/+1
| | | |
| | * | Fix incorrect example.Ben Orenstein2011-02-271-2/+2
| | | |
| | * | Fix incorrect word.Ben Orenstein2011-02-271-1/+1
| | | |
| | * | Clarify comment by removing french reference ('a la'). Should improve ↵Ben Orenstein2011-02-261-1/+1
| | | | | | | | | | | | | | | | readability for non-native english speakers.
| | * | Example descriptions and their examples were flipped. Fix.Ben Orenstein2011-02-261-3/+3
| | | |
| | * | Correct example that did not do what it claimed. Rework explanation.Ben Orenstein2011-02-261-5/+5
| | | |
| * | | Report the correct value of nil.id in the exception messageAndrew White2011-03-062-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. [#6444 state:resolved]
* / | use sort_by instead of sort()Aaron Patterson2011-03-051-1/+1
|/ /