Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Dont do underscore and camelize, only camelize is fine | Semyon Perepelitsa | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | There is an "inherit" option on const_get too, why not use it? | Semyon Perepelitsa | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #4804 from rafaelfranca/check_box-fix | José Valim | 2012-02-01 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | check_box with nil as unchecked value should be HTML safe | |||||
| * | | | | | | | check_box with nil as unchecked value should be HTML safe | Rafael Mendonça França | 2012-01-31 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | |||||
* | | | | | | | | revise docs [ci skip] | Vijay Dev | 2012-02-01 | 2 | -4/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | document the AR none method [ci skip] | Vijay Dev | 2012-02-01 | 2 | -7/+31 | |
| | | | | | | | | ||||||
* | | | | | | | | fix a typo [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #4825 from sikachu/master-fix-plugin-new | José Valim | 2012-02-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix broken test introduced from #4814 | |||||
| * | | | | | | | | Fix broken test introduced from #4814 | Prem Sichanugrist | 2012-02-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ruby_debugger_gemfile_entry was removed from the generator. Please make sure to run `grep` or `ack` to make sure it was removed in every places. | |||||
* | | | | | | | | | Merge pull request #4826 from kennyj/fix_4737-2 | José Valim | 2012-02-01 | 2 | -8/+11 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin. | |||||
| * | | | | | | | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin. | kennyj | 2012-02-02 | 2 | -8/+11 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 11 | -24/+37 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fixes the plus sign properly [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Revert "fixing text to match what is being displayed" | Vijay Dev | 2012-02-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5be94cedce3f80923661a2f1fee02c9bfc2e95b2. Reason: This commit is incorrect. | |||||
| * | | | | | | | | escape plus sign in "Rails 2.3+" to fix markup | daniely | 2012-02-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Improve readonly examples and optimistic locking docs | Carlos Antonio da Silva | 2012-01-31 | 2 | -9/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Relation#order can receive order attributes as different arguments, add example; * Readonly does not handle deletion of records, only modification; * locking_version column does not need to default to 0, Rails handles nil values; * Change references from "set_locking_column" to "self.locking_column". | |||||
| * | | | | | | | | Improve ar associations habtm docs a bit | Carlos Antonio da Silva | 2012-01-31 | 1 | -5/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Patrick Davey | 2012-01-31 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fixed typo. "from" should be "form". | Ying Tsen Hong | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixing text to match what is being displayed | Patrick Davey | 2012-01-31 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Fixing some double quotes that should be single quotes | Carol Nichols | 2012-01-29 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update .travis.yml | ben | 2012-01-30 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | https://github.com/lifo/docrails/blob/master/.travis.yml | ben | 2012-01-30 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Sorry for editing this file. | Meck | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update README.rdoc | Meck | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Improve active record associations guide a bit | Carlos Antonio da Silva | 2012-01-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use right example for has_many :find method; * Reword has_many :counter_sql doc notes. | |||||
| * | | | | | | | | Whitespace only: Use single newline at end of file. | Brook Riggio | 2012-01-27 | 3 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring these files into accordance with the prevailing convention. | |||||
| * | | | | | | | | Updates documentaton to indicate that :expires_in can be used with all cache ↵ | dev | 2012-01-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stores. | |||||
| * | | | | | | | | [ci skip] More docs for ActiveSupport::MessageEncryptor | Daniel Fone | 2012-01-26 | 1 | -0/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4814 from guilleiguaran/remove-ruby-debugger-method | Santiago Pastorino | 2012-02-01 | 2 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove ruby_debugger_gemfile_entry from app_base | |||||
| * | | | | | | | | | Remove ruby_debugger_gemfile_entry from app_base, we can just put ↵ | Guillermo Iguaran | 2012-02-01 | 2 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-debug19 commented directly in Gemfile | |||||
* | | | | | | | | | | Merge pull request #4821 from carlosantoniodasilva/strict-validation | José Valim | 2012-02-01 | 3 | -11/+19 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Generate strict validation error messages with attribute name | |||||
| * | | | | | | | | | Generate strict validation error messages with attribute name | Carlos Antonio da Silva | 2012-02-01 | 3 | -11/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4818 from arunagw/build_fix_isolated | José Valim | 2012-02-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Build fix when running isolated test | |||||
| * | | | | | | | | | Build fix when running isolated test | Arun Agrawal | 2012-02-01 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4433 from carlosantoniodasilva/html-escape-once | José Valim | 2012-02-01 | 4 | -2/+35 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Html escape once | |||||
| * | | | | | | | | | Move escaping regexps to constants | Carlos Antonio da Silva | 2012-02-01 | 1 | -2/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Move escape_once logic to ERB::Util, where it belongs to | Carlos Antonio da Silva | 2012-02-01 | 4 | -1/+32 | |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it. | |||||
* | | | | | | | | | Merge pull request #4672 from carlosantoniodasilva/av-url-helper | José Valim | 2012-02-01 | 2 | -31/+21 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improvements on some url helper methods and tests | |||||
| * | | | | | | | | | Refactor button_to to avoid calling method#to_s twice | Carlos Antonio da Silva | 2012-01-25 | 1 | -23/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize button_to implementation a bit. Also small refactor on current_page? method. | |||||
| * | | | | | | | | | Change OrderedHash with array options to simple hash usage | Carlos Antonio da Silva | 2012-01-25 | 1 | -8/+8 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4808 from route/mb_chars_as_json | José Valim | 2012-01-31 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Added as_json method for multibyte strings | |||||
| * | | | | | | | | | Added as_json method for multibyte strings | Dmitriy Vorotilin | 2012-02-01 | 2 | -0/+7 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentations | Aaron Patterson | 2012-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | warning removed: mismatched indentations | |||||
| * | | | | | | | | warning removed: mismatched indentations | Arun Agrawal | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Revert "Merge pull request #4746 from jenslukowski/issue4718" | Aaron Patterson | 2012-01-31 | 2 | -16/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68. | |||||
* | | | | | | | | | Merge pull request #4805 from xuanxu/none_and_null_object_pattern | Jon Leighton | 2012-01-31 | 6 | -1/+71 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Added `none` query method to return zero records. | |||||
| * | | | | | | | | Added `none` query method to return zero records. | Juanjo Bazán | 2012-01-31 | 6 | -1/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And added NullRelation class implementing the null object pattern for the `Relation` class. | |||||
* | | | | | | | | | QueryCache will just dup an AR::Result, AR::Result can deep copy | Aaron Patterson | 2012-01-31 | 2 | -9/+21 | |
| | | | | | | | | | ||||||
* | | | | | | | | | always return the result set from select_all | Aaron Patterson | 2012-01-31 | 2 | -2/+2 | |
| | | | | | | | | |