Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | alias_method added | Sachin87 | 2012-01-23 | 1 | -4/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4614 from arunagw/unused_var_remove | José Valim | 2012-01-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Unused var removed | |||||
| * | | | | | | | | | Unused var removed | Arun Agrawal | 2012-01-23 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4613 from pda/cookie_jar_deleted_predicate | José Valim | 2012-01-23 | 2 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | CookieJar#deleted? predicate method | |||||
| * | | | | | | | | | ActionDispatch::Cookies::CookieJar#deleted? predicate method. | Paul Annesley | 2012-01-24 | 2 | -0/+20 | |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary in controller tests to determine if the CookieJar will delete the given cookie. | |||||
* | | | | | | | | | Merge pull request #4612 from rafaelfranca/av-refactor | José Valim | 2012-01-23 | 6 | -28/+53 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Some improvements on ActionView::Helpers::Tags | |||||
| * | | | | | | | | | Raise a better error if anyone wants to create your own ↵ | Rafael Mendonça França | 2012-01-23 | 2 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::Tags::Base child and do not implement the render method | |||||
| * | | | | | | | | | properly memoize {field_type,select_type} as class variable | Akira Matsuda | 2012-01-23 | 2 | -2/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | no need to module_eval here anymore | Akira Matsuda | 2012-01-23 | 1 | -1/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Use ActiveSupport::Autoload to autoload the tags | Rafael Mendonça França | 2012-01-23 | 1 | -23/+25 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4610 from lest/patch-2 | José Valim | 2012-01-22 | 3 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | use rack 1.4.1 | |||||
| * | | | | | | | | | use rack 1.4.1 | Sergey Nartimov | 2012-01-23 | 3 | -5/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4608 from indrekj/translated_date_order | José Valim | 2012-01-22 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Raise exception when date.order includes invalid elements | |||||
| * | | | | | | | | | Raise exception when date.order includes invalid elements | Indrek Juhkam | 2012-01-22 | 2 | -1/+17 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Clean up http config | Jeremy Kemper | 2012-01-22 | 2 | -27/+16 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Clean up SSL client cert example | Jeremy Kemper | 2012-01-22 | 1 | -4/+8 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Prefer to document with https:// example URLs and no port numbers | Jeremy Kemper | 2012-01-22 | 3 | -20/+20 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Describe Basic and Digest authentication. Document how to set auth_type to ↵ | Jeremy Kemper | 2012-01-22 | 1 | -14/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :digest. | |||||
* | | | | | | | | | One space separates sentences, not two | Jeremy Kemper | 2012-01-22 | 3 | -34/+34 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4605 from lest/patch-1 | José Valim | 2012-01-22 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove obsolete code as old actionmailer api was removed | |||||
| * | | | | | | | | remove obsolete code as old actionmailer api was removed | Sergey Nartimov | 2012-01-22 | 1 | -3/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵ | José Valim | 2012-01-22 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bash, zsh, etc, closes #4602 Conflicts: railties/test/generators/migration_generator_test.rb | |||||
* | | | | | | | | | Merge pull request #4574 from ihid/master | José Valim | 2012-01-21 | 2 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed regression - unable to use a range as choices for form.select. | |||||
| * | | | | | | | | | Fix inconsistent ability to use a range as choices for select_tag. | Jeremy Walker | 2012-01-21 | 2 | -0/+17 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4599 from jarijokinen/patch-1 | José Valim | 2012-01-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix typo | |||||
| * | | | | | | | | | | Fix typo | Jari Jokinen | 2012-01-22 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4592 from jviney/master | José Valim | 2012-01-21 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting $rails_rake_task variable. | |||||
| * | | | | | | | | | | | Fix `$rails_rake_task` global variable warning without replacing the value ↵ | Jonathan Viney | 2012-01-22 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. | |||||
* | | | | | | | | | | | | Merge pull request #4598 from sachin87/action_mailer | José Valim | 2012-01-21 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | some modifications in action_mailer/base.rb | |||||
| * | | | | | | | | | | | some modifications in action_mailer/base.rb | Sachin87 | 2012-01-22 | 1 | -2/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | uniformizes the punctuation of comments in some files generated for new apps | Xavier Noria | 2012-01-22 | 8 | -82/+82 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some end with a full stop, some don't. Let's have attention to detail and make them uniform. I have chosen to add full stops according to our documentation guidelines related to RDoc. | |||||
* | | | | | | | | | | | Split Basic and Digest authorization tests | Jeremy Kemper | 2012-01-21 | 1 | -82/+79 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4588 from carlosantoniodasilva/remove-require-csrf | José Valim | 2012-01-21 | 2 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Remove not used requires from csrf helper file and test | |||||
| * | | | | | | | | | | Remove not used requires from csrf helper file and test | Carlos Antonio da Silva | 2012-01-21 | 2 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These requires were added in a87b92d and the implementation changed in 2cdc1f0, removing the need for them. | |||||
* | | | | | | | | | | | Merge pull request #4575 from carlosantoniodasilva/remove-test-pending | José Valim | 2012-01-21 | 3 | -22/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | Remove ActiveSupport::TestCase#pending, use `skip` instead | |||||
| * | | | | | | | | | | Remove ActiveSupport::TestCase#pending, use `skip` instead | Carlos Antonio da Silva | 2012-01-21 | 3 | -22/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-21 | 3 | -24/+27 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Revert "Fixed typo in 'cast'." | Vijay Dev | 2012-01-21 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ecac7c96451ee8d85ca602c9ce3416a5e7ef6a03. Reason: Changelogs are not meant to be changed from docrails. | |||||
| * | | | | | | | | | Why do we even need a constant here? A variable is fine. | Semyon Perepelitsa | 2012-01-21 | 1 | -4/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | TaggedLogging wraps an object, not a class. | Semyon Perepelitsa | 2012-01-21 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Do not use the same Logger constant for class (from stdlib) and for instance ↵ | Semyon Perepelitsa | 2012-01-21 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (from the example) | |||||
| * | | | | | | | | | Fixed typo in 'cast'. | Aleksey Gureiev | 2012-01-20 | 2 | -6/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #78 from trotter/fix-rails-engine-docs | Benjamin Manns | 2012-01-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix documentation bug in Rails::Engine | |||||
| | * | | | | | | | | | Fix documentation bug in Rails::Engine | Trotter Cashion | 2012-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-20 | 1 | -0/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #79 from doriath/master | Xavier Noria | 2012-01-20 | 1 | -19/+19 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Fix indentation in comment of Delegation module | |||||
| | * | | | | | | | | | Fix indentation in code example of Delegation | Tomasz Zurkowski | 2012-01-20 | 1 | -19/+19 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4573 from amatsuda/ar_default_timezone_utc | José Valim | 2012-01-21 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | change AR default_timezone to :utc since it's the default for AR::Railtie | |||||
| * | | | | | | | | | change AR default_timezone to :utc since it's the default for AR::Railtie | Akira Matsuda | 2012-01-21 | 2 | -5/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4572 from semaperepelitsa/noregexp | José Valim | 2012-01-21 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Replace regexp matching with a simple string manipulation. |