Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 2 | -1/+7 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | if you want to read the file you may need to ask if there is something to read from | |||||
* | | | | | attributes are cached by string keys, so to_s to support symbols. fixes #5549 | Aaron Patterson | 2012-03-27 | 3 | -2/+17 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-27 | 8 | -6/+69 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | minor edits in testing guide [ci skip] | Vijay Dev | 2012-03-27 | 1 | -4/+2 | |
| | | | | | ||||||
| * | | | | add missing do [ci skip] | Vijay Dev | 2012-03-27 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide" | Vijay Dev | 2012-03-27 | 1 | -16/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83. Reason: The guide had the contents of railties/bin/rails and I don't see any reason to change it. | |||||
| * | | | | Proc objects for caches_page no need controller object | Alexey Vakhov | 2012-03-27 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | added shallow_prefix option description in documantation | Lukasz Sarnacki | 2012-03-27 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | | | It is in response for confusion in issue #5301 | |||||
| * | | | | Missing generated query for pluck method. | Juanjo Bazán | 2012-03-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | (and changed the use of true for a more database agnostic example). | |||||
| * | | | | Made it a bit more clear where to run rails/server | Dimitri De Frenne | 2012-03-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fixed typo in path | Dimitri De Frenne | 2012-03-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | document `-e` argument for rails console | schneems | 2012-03-24 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | this adds documentation for -e flag which sets the environment of the rails console like the `rails server` command. | |||||
| * | | | | Testing layout gotcha when view renders partial | Panayotis Matsinopoulos | 2012-03-24 | 1 | -0/+16 | |
| | | | | | ||||||
| * | | | | Small layout correction | Panayotis Matsinopoulos | 2012-03-24 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Testing Template and Layout Example | Panayotis Matsinopoulos | 2012-03-24 | 1 | -0/+25 | |
| | | | | | ||||||
| * | | | | Use one 'be'. | Waseem Ahmad | 2012-03-24 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix AC actions caching comment | Alexey Vakhov | 2012-03-24 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | [ci skip] updated bin/rails code in Rails Initialization Process guide | Senthil A | 2012-03-24 | 1 | -6/+16 | |
| | | | | | ||||||
* | | | | | Merge pull request #5499 from arunagw/remove_unused_code | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | removed unused variables | |||||
| * | | | | removed unused variables | Arun Agrawal | 2012-03-27 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 3 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | |||||
* | | | | | Merge pull request #5609 from tjmcewan/master | José Valim | 2012-03-27 | 2 | -0/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | prevent returning a negative zero from number_with_precision | |||||
| * | | | | change number_with_precision to not return negative zeros | Tim McEwan | 2012-03-27 | 2 | -0/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #5582 from chendo/master | Xavier Noria | 2012-03-26 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Remove "needless boolean casting" | |||||
| * | | | | Remove 'needless boolean casting'. | Jack Chen (chendo) | 2012-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | "Predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsoever." - @fxn | |||||
* | | | | | favor composition over inheritance | Aaron Patterson | 2012-03-26 | 1 | -5/+20 | |
| | | | | | ||||||
* | | | | | Don't ignore non Enumerable values passed to sanitize (closes #5585) | Piotr Sarnacki | 2012-03-27 | 2 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed. | |||||
* | | | | | favor composition over inheritance | Aaron Patterson | 2012-03-26 | 2 | -8/+30 | |
| | | | | | ||||||
* | | | | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Issue with schema dump | |||||
| * | | | | | Not checking for nil is apparently a lot faster. | Nat Welch | 2011-09-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of git://github.com/rails/rails | Nat Welch | 2011-09-21 | 349 | -3121/+6229 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | From @dasch's recommendation. | Nat Welch | 2011-08-22 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Fixes bug with schema dumper when using with Padrino. | Nat Welch | 2011-08-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash | Aaron Patterson | 2012-03-26 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cookie store session hash | |||||
| * | | | | | | | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 | |||||
| * | | | | | | | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #5331 from castlerock/remove_unused_require | Aaron Patterson | 2012-03-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove unused require from AS/core_ext/class/delegating_att.rb | |||||
| * | | | | | | | | remove unused require from AS/core_ext/class/delegating_att.rb | Vishnu Atrai | 2012-03-10 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | still need to ensure the path is a directory | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | eliminating a branch we do not need. thanks @jeremy | Aaron Patterson | 2012-03-26 | 1 | -30/+3 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | stop using *args in order to simplify our constructor | Aaron Patterson | 2012-03-26 | 1 | -5/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #5592 from nashby/fix-issue-5584 | Piotr Sarnacki | 2012-03-26 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | String#titleize works properly with smart quotes | |||||
| * | | | | | | | | String#titleize works properly with smart quotes, closes #5584 | Vasiliy Ermolovich | 2012-03-26 | 2 | -3/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg | Aaron Patterson | 2012-03-26 | 2 | -3/+21 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Properly deprecate the block argument in AV FormBuilder | |||||
| * | | | | | | | | | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 2 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166 | |||||
* | | | | | | | | | | Don't depend on ivars. Thanks @fesplugas | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5594 from lest/patch-1 | Piotr Sarnacki | 2012-03-26 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | apply form_for namespace option to date_select | |||||
| * | | | | | | | | | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 2 | -1/+12 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an error | Guten | 2012-03-26 | 2 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb | |||||
* | | | | | | | | | | | Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0 | Aaron Patterson | 2012-03-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from Gemfile |