Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Prevent callbacks in child classes from being executed more than once. | Rolf Timmermans | 2011-03-13 | 2 | -1/+31 | |
| | | | | ||||||
| | * | | It should be possible to use ActiveSupport::DescendantTracker without ↵ | Rolf Timmermans | 2011-03-13 | 1 | -7/+9 | |
| | | | | | | | | | | | | | | | | getting ActiveSupport::Dependencies for free. | |||||
| | * | | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | adds a couple of missing AS dependencies | Rolf Timmermans | 2011-03-12 | 2 | -0/+3 | |
| | | | | ||||||
| * | | | oracle, y u defy me | Jon Leighton | 2011-03-16 | 5 | -13/+15 | |
| | | | | ||||||
| * | | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 4 | -19/+23 | |
| | | | | | | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | |||||
| * | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-12 | 8 | -20/+117 | |
| |\| | | ||||||
| | * | | Just define methods directly on the class rather than use the module | Aaron Patterson | 2011-03-11 | 1 | -14/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | indirection. clever-- | |||||
| | * | | do not automatically add format to routes that end in a slash | Aaron Patterson | 2011-03-11 | 2 | -1/+52 | |
| | | | | ||||||
| | * | | Add missing require 'thread' to BufferedLogger. | José Valim | 2011-03-11 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Add require 'date' to use Date.today in plugin template MIT-LICENSE | Samuel Kadolph | 2011-03-12 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Filter sensitive query string parameters in the log [#6244 state:committed] | Prem Sichanugrist & Xavier Noria | 2011-03-11 | 4 | -5/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens. Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | | | Resolve some TODO comments which I decided did not need anything done | Jon Leighton | 2011-03-12 | 3 | -9/+5 | |
| | | | | ||||||
| * | | | Simplify implementation of ThroughReflection#chain | Jon Leighton | 2011-03-11 | 2 | -23/+3 | |
| | | | | ||||||
| * | | | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 4 | -97/+83 | |
| | | | | | | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module | |||||
| * | | | Refactor JoinAssociation | Jon Leighton | 2011-03-10 | 1 | -100/+54 | |
| | | | | ||||||
| * | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-10 | 49 | -129/+231 | |
| |\| | | ||||||
| | * | | Fix typo | Santiago Pastorino | 2011-03-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | publicise ActionMailer::MailHelper.format_paragraph | Diego Carrion | 2011-03-09 | 2 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#6550 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | 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. | |||||
| | * | | copy-edits 532b770 | Xavier Noria | 2011-03-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Use Rubys own Float#round method in versions 1.9 and above | Andrei Kulakov | 2011-03-10 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Filter params that return nil for to_param and allow through false values | Andrew White | 2011-03-09 | 4 | -2/+13 | |
| | | | | ||||||
| | * | | revises links to the API websites of individual components (no longer ↵ | Xavier Noria | 2011-03-09 | 4 | -16/+25 | |
| | | | | | | | | | | | | | | | | maintained), and rewrites the section about after and around filters in the controller guide | |||||
| | * | | refactored Engine.#find by giving an explicit name to a variable and ↵ | Diego Carrion | 2011-03-09 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reducing calls [#6529 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | stop being clever and just call methods on the Route object | Aaron Patterson | 2011-03-08 | 2 | -1/+4 | |
| | | | | ||||||
| | * | | test/unit in ruby trunk adds a new instance variable. YAY! | Aaron Patterson | 2011-03-08 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Rename conflicting ActionMailer::MailHelper#simple_format method | Mat Brown | 2011-03-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates. | |||||
| | * | | The root route example was the only using double quotes; switched it to ↵ | Chris Kalafarski | 2011-03-08 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | single quotes for consistency | |||||
| | * | Add better test scenario for around callback return results | Aaron Pfeifer | 2011-03-08 | 1 | -0/+10 | |
| | | | ||||||
| | * | Allow access to a callback event's return result from around callbacks | Aaron Pfeifer | 2011-03-08 | 2 | -2/+32 | |
| | | | ||||||
| | * | removing stubs. 1.9.3 implements Date.today in C so mocking the return value ↵ | Aaron Patterson | 2011-03-07 | 1 | -9/+4 | |
| | | | | | | | | | | | | of Time.now does nothing | |||||
| | * | 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 | 29 | -87/+79 | |
| | |\ | ||||||
| | | * | formatting changes | Vijay Dev | 2011-03-07 | 2 | -15/+14 | |
| | | | | ||||||
| | | * | Improved docs for Hash#to_param method | Dalibor Nasevic | 2011-03-06 | 1 | -3/+2 | |
| | | | | ||||||
| | | * | Configuration options are symbols | Paco Guzman | 2011-03-06 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | Remove Example headers. Code just flows with the text. 6ce844a3 | Paco Guzman | 2011-03-06 | 3 | -8/+2 | |
| | | | | ||||||
| | | * | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 18 | -52/+52 | |
| | | | | | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | |||||
| | | * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 4 | -4/+4 | |
| | | | | | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | |||||
| | | * | s/a/an/ | Akira Matsuda | 2011-03-07 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | fix typos | Akira Matsuda | 2011-03-07 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 5 | -50/+53 | |
| | | | | | | | | | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | |||||
| * | | | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 9 | -215/+162 | |
| | | | | | | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association. | |||||
| * | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-07 | 25 | -44/+193 | |
| |\| | | ||||||
| | * | | do not test explicit equality of predicate methods, they should be allowed ↵ | Aaron Patterson | 2011-03-07 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | | | to return truthy or falsey objects | |||||
| | * | | refactor calls to to_param in expand_key method | Aaron Patterson | 2011-03-07 | 1 | -9/+10 | |
| | | | | ||||||
| | * | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 | |
| | | | | | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | |||||
| | * | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-03-07 | 23 | -27/+179 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ... |