| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | removed AS backends and instead rely on MultiJson for json decoding | Josh Kalderimis | 2011-04-18 | 4 | -227/+33 | |
| |/ / / | ||||||
| * | | | Add String#inquiry as a convenience method for turning a string into a ↵ | David Heinemeier Hansson | 2011-04-18 | 2 | -0/+14 | |
| | | | | | | | | | | | | | StringInquirer object [DHH] | |||||
| * | | | Only rescue a thrown NoMethodError, don't preemptively check for #include?; ↵ | Jared McFarland | 2011-04-15 | 1 | -1/+4 | |
| | | | | | | | | | | | | | added tests | |||||
| * | | | added an exception to Object#in? to match the methods documentation | Jared McFarland | 2011-04-15 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | files are a special case and need whitespace to be significant | Andre Arko | 2011-04-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | gsub is not needed (thanks @fxn!) | Andre Arko | 2011-04-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | attributes no longer disappear if a tag contains whitespace | Andre Arko | 2011-04-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>"\n"} new: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"} | |||||
| * | | | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 4 | -13/+4 | |
| |/ / | | | | | | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`. | |||||
| * | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 4 | -6/+6 | |
| | | | | | | | | | suggestion! | |||||
| * | | Cant use inclusion in commands/application.rb as the frameworks havent all ↵ | David Heinemeier Hansson | 2011-04-11 | 1 | -0/+1 | |
| | | | | | | | | | been required yet | |||||
| * | | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 3 | -4/+7 | |
| | | | | | | | | | 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 Reitano | 2011-04-11 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 Kalderimis | 2011-04-05 | 4 | -18/+21 | |
| | | | | | | | | | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | Raise on invalid timezone | Marc-Andre Lafortune | 2011-04-05 | 2 | -9/+13 | |
| | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 1 | -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 | |||||
| * | | | Moved Turn activation/dependency to railties | David Heinemeier Hansson | 2011-03-31 | 2 | -34/+0 | |
| | | | | ||||||
| * | | | Add using Turn with natural language test case names if the library is ↵ | David Heinemeier Hansson | 2011-03-31 | 3 | -17/+42 | |
| | | | | | | | | | | | | | available (which it will be in Rails 3.1) [DHH] | |||||
| * | | | require turn only for minitest | David Heinemeier Hansson | 2011-03-31 | 1 | -2/+6 | |
| | | | | ||||||
| * | | | Use Turn to format all Rails tests and enable the natural language case names | David Heinemeier Hansson | 2011-03-31 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | Delegate pending to skip if Minitest is available | David Heinemeier Hansson | 2011-03-30 | 1 | -21/+25 | |
| |/ / | ||||||
| * | | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 1 | -2/+2 | |
| | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | test json decoding with time parsing disabled with all backends and respect ↵ | Diego Carrion | 2011-03-22 | 1 | -3/+5 | |
| | | | | | | | | | | | | | 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é Valim | 2011-03-13 | 1 | -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 Timmermans | 2011-03-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | It should be possible to use ActiveSupport::DescendantTracker without ↵ | Rolf Timmermans | 2011-03-13 | 1 | -7/+9 | |
| | | | | | | | | | getting ActiveSupport::Dependencies for free. | |||||
| * | | adds a couple of missing AS dependencies | Rolf Timmermans | 2011-03-12 | 2 | -0/+3 | |
| |/ | ||||||
| * | Add missing require 'thread' to BufferedLogger. | José Valim | 2011-03-11 | 1 | -0/+1 | |
| | | ||||||
| * | move the conditional definition of Float#round down | Xavier Noria | 2011-03-09 | 2 | -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 above | Andrei Kulakov | 2011-03-10 | 1 | -1/+1 | |
| | | ||||||
| * | Allow access to a callback event's return result from around callbacks | Aaron Pfeifer | 2011-03-08 | 1 | -2/+8 | |
| | | ||||||
| * | fixing some tests on ruby 1.9.3 | Aaron Patterson | 2011-03-07 | 1 | -0/+23 | |
| | | ||||||
| * | reorganizes the RDoc of Hash#to_param | Xavier Noria | 2011-03-07 | 1 | -6/+14 | |
| | | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 3 | -7/+6 | |
| |\ | ||||||
| | * | Improved docs for Hash#to_param method | Dalibor Nasevic | 2011-03-06 | 1 | -3/+2 | |
| | | | ||||||
| | * | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 2 | -4/+4 | |
| | | | | | | | | | 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 Patterson | 2011-03-07 | 1 | -5/+1 | |
| | | | | | | | | | to return truthy or falsey objects | |||||
| * | | refactor calls to to_param in expand_key method | Aaron Patterson | 2011-03-07 | 1 | -9/+10 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-03-07 | 8 | -14/+14 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 conflicts | Xavier Noria | 2011-03-06 | 2 | -15/+0 | |
| | | | ||||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-06 | 9 | -13/+28 | |
| | |\ | ||||||
| | | * | removes Examples headers introduced in 9b96de6 | Xavier Noria | 2011-03-06 | 1 | -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 changes | suchasurge | 2011-03-06 | 2 | -2/+2 | |
| | | | | ||||||
| | | * | Some style changes | suchasurge | 2011-03-06 | 5 | -5/+11 | |
| | | | | ||||||
| | | * | merges rails | Xavier Noria | 2011-03-05 | 11 | -75/+118 | |
| | | |\ | ||||||
| | | * | | Active Support typos. | R.T. Lechow | 2011-03-04 | 6 | -6/+6 | |
| | | | | | ||||||
| | | * | | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Fix incorrect example. | Ben Orenstein | 2011-02-27 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | Fix incorrect word. | Ben Orenstein | 2011-02-27 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Clarify comment by removing french reference ('a la'). Should improve ↵ | Ben Orenstein | 2011-02-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | readability for non-native english speakers. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |