Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix a tiny typo in custom validators documentation | Jean Boussier | 2011-11-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Cosmetic fix in number_to_currency docs | Alexey Vakhov | 2011-11-10 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #3617 from indirect/remote_ip | José Valim | 2011-11-13 | 2 | -53/+55 | |
|\ \ \ \ | |_|/ / |/| | | | refactor RemoteIp middleware | |||||
| * | | | defer calculating the remote IP until requested | Andre Arko | 2011-11-12 | 1 | -24/+36 | |
| | | | | ||||||
| * | | | refactor RemoteIp middleware | Andre Arko | 2011-11-11 | 2 | -55/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - return the last forwarded IP before REMOTE_ADDR to handle proxies - remove completely superfluous RemoteIpGetter class - remove duplication of trusted proxies regexp - remove unused constant from Request - move comments from Request to where they are actually relevant - edit comments for clarity of purpose The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address. | |||||
* | | | | Allow to use ruby-debug in 1.9.3 | Santiago Pastorino | 2011-11-12 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3618 from amatsuda/ad_headers_unmemoizable | Jon Leighton | 2011-11-12 | 1 | -2/+0 | |
|\ \ \ \ | |/ / / |/| | | | Unneeded require 'active_support/memoizable' | |||||
| * | | | Unneeded require memoizable | Akira Matsuda | 2011-11-12 | 1 | -2/+0 | |
|/ / / | ||||||
* | | | Merge pull request #3613 from mitio/fix-actionpack-responder-docs | Xavier Noria | 2011-11-11 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | Fix wording and minor typos in the Responder RDoc | |||||
| * | | | Fix wording and minor typos in the Responder RDoc | Dimitar Dimitrov | 2011-11-11 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | Merge pull request #3611 from bogdan/compile_options | José Valim | 2011-11-11 | 1 | -14/+12 | |
|\ \ \ \ | | | | | | | | | | | AS::Callbacks::Callback#_compile_option refactored | |||||
| * | | | | AS::Callbacks::Callback#_compile_option refactored | Bogdan Gusiev | 2011-11-11 | 1 | -14/+12 | |
|/ / / / | ||||||
* | | | | Merge pull request #3609 from noefroidevaux/issue_3595 | Aaron Patterson | 2011-11-11 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Prevent multiple SHOW TABLES calls when a table don't exists in database... | |||||
| * | | | | Prevent multiple SHOW TABLES calls when a table don't exists in database. | Noé Froidevaux | 2011-11-11 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #3607 from bogdan/callbacks | José Valim | 2011-11-11 | 1 | -10/+6 | |
|\ \ \ \ | | | | | | | | | | | AS::Callbacks.__run_keyed_callback: remove unused cache | |||||
| * | | | | AS::Callbacks.__run_keyed_callback: remove unused cache | Bogdan Gusiev | 2011-11-10 | 1 | -10/+6 | |
| | | | | | ||||||
* | | | | | change_table bulk test case should check if the connection supports bulk alter | Vijay Dev | 2011-11-11 | 1 | -13/+15 | |
| | | | | | ||||||
* | | | | | Merge pull request #3603 from vijaydev/change_table_without_block_arg | José Valim | 2011-11-10 | 2 | -7/+64 | |
|\ \ \ \ \ | | | | | | | | | | | | | Modify change_table to remove the need for the block argument | |||||
| * | | | | | Modify change_table to remove the need for the block argument. | Vijay Dev | 2011-11-11 | 2 | -7/+64 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3600 from vijaydev/migration_arity | José Valim | 2011-11-10 | 2 | -1/+22 | |
|\ \ \ \ \ | | | | | | | | | | | | | Checking the arity of the block passed to create_table | |||||
| * | | | | | Checking the arity of the block passed to create_table | Vijay Dev | 2011-11-10 | 2 | -1/+22 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change made to create_table does away with the need for the block argument. Checking the arity will prevent the mixing up of the two syntaxes. | |||||
* / / / / | Fixes deprecation warning about passing a template handler | Vijay Dev | 2011-11-10 | 1 | -1/+2 | |
|/ / / / | | | | | | | | | | | | | | | | | in the template name while generating guide related pages like index, layout and credits | |||||
* | | | | self.class.name -> self.name (we are already inside a class). | José Valim | 2011-11-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3592 from avakhov/av-highlight-regexp | José Valim | 2011-11-10 | 2 | -1/+5 | |
|\ \ \ \ | | | | | | | | | | | Fix and simplify highlight regexp | |||||
| * | | | | Fix and simplify highlight regexp | Alexey Vakhov | 2011-11-10 | 2 | -1/+5 | |
| | | | | | ||||||
* | | | | | Merge pull request #3591 from tylercoville/fix-plugin-new | José Valim | 2011-11-10 | 3 | -4/+12 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed error with 'rails generate new plugin' where the .gitignore was not | |||||
| * | | | | | Fixed error with 'rails generate new plugin' where the .gitignore was not ↵ | Tyler Coville | 2011-11-09 | 3 | -4/+12 | |
| |/ / / / | | | | | | | | | | | | | | | | properly generated if --dummy-path was used and added test case | |||||
* | | | | | Merge pull request #3593 from bogdan/callbacks | José Valim | 2011-11-10 | 1 | -23/+22 | |
|\ \ \ \ \ | | | | | | | | | | | | | AS::Callbacks._define_runner better abstraction | |||||
| * | | | | | AS::Callbacks#_define_runner refactored | Bogdan Gusiev | 2011-11-10 | 1 | -23/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incapsulate the logic of keyed callback method definition and execution in the separated method. | |||||
* | | | | | | Merge pull request #3581 from amatsuda/metal_response_body_19 | José Valim | 2011-11-10 | 2 | -1/+13 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9 | |||||
| * | | | | | A test case to ensure that AC::Metal#response_body= always wraps the given ↵ | Akira Matsuda | 2011-11-10 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | value in an Array in both Ruby 1.8 and 1.9 (refs #3581) | |||||
| * | | | | | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9 | Akira Matsuda | 2011-11-07 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This was because String#respond_to?(:each) differs in 1.8 and 1.9 | |||||
* | | | | | | Don't marshal dump twice when using encryptor. | José Valim | 2011-11-09 | 2 | -3/+13 | |
| | | | | | | ||||||
* | | | | | | Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. | José Valim | 2011-11-09 | 3 | -41/+70 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix | José Valim | 2011-11-09 | 2 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application | |||||
| * | | | | | | Extend IRB right before starting IRB to remove dependency on IRB from ↵ | Akira Matsuda | 2011-11-10 | 2 | -2/+2 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Rails::Application | |||||
* | | | | | | Use head :no_content on the guides as well. | José Valim | 2011-11-09 | 2 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #3509 from amatsuda/console_extend_command_bundle | José Valim | 2011-11-09 | 4 | -31/+47 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | move Rails console top level methods to IRB context | |||||
| * | | | | | | Modulize Rails console methods so that other console libraries such as Pry ↵ | Akira Matsuda | 2011-11-09 | 4 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | can include these methods | |||||
| * | | | | | | move Rails console top level methods to IRB context | Akira Matsuda | 2011-11-04 | 3 | -31/+45 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #3579 from arunagw/missing_md_in_changelog | Vijay Dev | 2011-11-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | CHANGELOG => CHANGELOG.md | |||||
| * | | | | | | | CHANGELOG => CHANGELOG.md | Arun Agrawal | 2011-11-09 | 1 | -2/+2 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | I missed these in previous commit | |||||
* | | | | | | | Merge pull request #3574 from arunagw/refactor_testing_uncommitted_task | Vijay Dev | 2011-11-08 | 1 | -10/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor test:uncommitted task. | |||||
| * | | | | | | | Refactor test:uncommitted task. | Arun Agrawal | 2011-11-09 | 1 | -10/+3 | |
|/ / / / / / / | | | | | | | | | | | | | | | Thanks to @sobrinho (Gabriel Sobrinho) | |||||
* | | | | | | | Merge pull request #3572 from amatsuda/ar_exists_uniq_order | Aaron Patterson | 2011-11-08 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | exclude ORDER BY clause when querying Relation#exists? | |||||
| * | | | | | | | exclude ORDER BY clause when querying Relation#exists? | Akira Matsuda | 2011-11-09 | 2 | -1/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3562 from rahul100885/rahul100885_work | Vijay Dev | 2011-11-08 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md | |||||
| * | | | | | | Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md | Rahul Chaudhari | 2011-11-08 | 1 | -7/+7 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-08 | 8 | -33/+25 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/active_record_querying.textile | |||||
| * | | | | | | | Replace example with SQL placeholder syntax. | Joost Baaij | 2011-11-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability. |