Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4035 from lest/date-type-cast | Aaron Patterson | 2011-12-20 | 2 | -7/+19 |
|\ | | | | | handle not only strings in date type cast | ||||
| * | handle not only strings in date type cast | Sergey Nartimov | 2011-12-19 | 2 | -7/+19 |
| | | |||||
* | | Remove dead code from AMo. | José Valim | 2011-12-20 | 2 | -59/+37 |
| | | |||||
* | | Remove more dead code from AS. | José Valim | 2011-12-20 | 4 | -55/+17 |
| | | |||||
* | | Merge pull request #4033 from nashby/date-helper-field-error-proc | José Valim | 2011-12-20 | 4 | -12/+35 |
|\ \ | | | | | | | add failing tests for issue #3487 | ||||
| * | | fix adding field_with_errors to date selects, closes #3487 | Vasiliy Ermolovich | 2011-12-20 | 3 | -11/+11 |
| | | | |||||
| * | | add failing tests for issue #3487 | Vasiliy Ermolovich | 2011-12-19 | 1 | -1/+24 |
| |/ | |||||
* | | Initial pass at removing dead 1.8.x code from Active Support. | José Valim | 2011-12-20 | 27 | -760/+118 |
| | | | | | | | | | | | | There are a bunch of other implicit branches that adds 1.8.x specific code that still needs to be removed. Pull requests for those cases are welcome. | ||||
* | | Get rid of more 1.8.x dead code | José Valim | 2011-12-20 | 10 | -55/+13 |
| | | |||||
* | | This test is rubbish. | José Valim | 2011-12-20 | 1 | -39/+0 |
| | | |||||
* | | Get rid of --old-style-hash | José Valim | 2011-12-20 | 5 | -58/+6 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-20 | 5 | -12/+11 |
|\ \ | |||||
| * | | remove unnecessary link. This is already mentioned in section 3 of the guide | Vijay Dev | 2011-12-20 | 1 | -3/+0 |
| | | | |||||
| * | | Revert "Fixed some grammatical errors in ↵ | Vijay Dev | 2011-12-20 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | raw_email_with_invalid_characters_in_content_type. Picky, I know." This reverts commit 30aa4e6c3b33d93c6b1a000685d6d97d51f7ab68. Reason: docrails doesn't allow changing code. As much as this is a plain text file, I would still like to enforce the policy strictly. | ||||
| * | | wrong link markup | Mikhail Dieterle | 2011-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Updated RUNNING_UNIT_TESTS" | Kristian Freeman | 2011-12-19 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | cp is not a valid command in DOS systems. This reverts commit 7d11c12958acf28ffb27d7e11a9c7f5b1418e77f. | ||||
| * | | Updated RUNNING_UNIT_TESTS | Kristian Freeman | 2011-12-19 | 1 | -2/+5 |
| | | | |||||
| * | | Removed period in comment regarding Levenshtein Wikipedia article to make a ↵ | Kristian Freeman | 2011-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | valid URL. | ||||
| * | | Fixed some grammatical errors in ↵ | Kristian Freeman | 2011-12-19 | 1 | -2/+3 |
| | | | | | | | | | | | | raw_email_with_invalid_characters_in_content_type. Picky, I know. | ||||
| * | | Fix syntax error in rdocs. | Semyon Perepelitsa | 2011-12-20 | 1 | -1/+1 |
| | | | | | | | | | Ruby assumes curly braces in foo {} as a block, for hash we need to put parentheses or omit braces | ||||
| * | | Fix reference to old :sql schema_format location | Alex Tambellini | 2011-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | After 15fb430 the default location of the :sql schema_format location was changed from environment_name.sql to structure.sql. This pull request updates a reference to the old schema format location in the migration guides. | ||||
| * | | Revert "Update master changelogs with rails 3.0-stable branch info" | Vijay Dev | 2011-12-18 | 7 | -273/+5 |
| | | | | | | | | | | | | | | | | | | This reverts commit 2bc8e5713764b2276036fecfd7f297132597fddb. Reason: Changelogs are not meant to be changed in docrails. | ||||
| * | | Update master changelogs with rails 3.0-stable branch info | Paco Guzman | 2011-12-18 | 7 | -5/+273 |
| | | | |||||
| * | | Improve doc for ActiveRecord::Base.unscoped. | Hendy Tanata | 2011-12-18 | 1 | -6/+8 |
| | | | |||||
* | | | Update ruby_version_check. | José Valim | 2011-12-20 | 2 | -14/+2 |
| | | | |||||
* | | | rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+ | David Heinemeier Hansson | 2011-12-20 | 9 | -25/+25 |
| | | | |||||
* | | | Merge pull request #4057 from joliss/gitignore | José Valim | 2011-12-20 | 2 | -0/+2 |
|\ \ \ | | | | | | | | | Add db/*.sqlite3-journal to .gitignore | ||||
| * | | | Add db/*.sqlite3-journal to .gitignore | Jo Liss | 2011-12-20 | 2 | -0/+2 |
|/ / / | | | | | | | | | | These can pop up while the SQLite DB is being written to. | ||||
* | | | Remove deprecations from Active Support. | José Valim | 2011-12-20 | 9 | -491/+0 |
| | | | |||||
* | | | Remove deprecation warnings from Action Pack. | José Valim | 2011-12-20 | 9 | -108/+6 |
| | | | |||||
* | | | Remove deprecated layout lookup. | José Valim | 2011-12-20 | 2 | -60/+27 |
| | | | |||||
* | | | Merge pull request #4052 from lest/warning-variable-for-layout | José Valim | 2011-12-20 | 1 | -5/+6 |
|\ \ \ | | | | | | | | | remove warnings about @variable_for_layout | ||||
| * | | | remove warnings about @variable_for_layout | lest | 2011-12-20 | 1 | -5/+6 |
|/ / / | |||||
* | | | Check if source is encoding aware. | José Valim | 2011-12-20 | 1 | -32/+30 |
| | | | |||||
* | | | Do not hard code encoding to UTF8 | José Valim | 2011-12-20 | 2 | -48/+54 |
| | | | |||||
* | | | Merge pull request #4043 from cqpx/master | José Valim | 2011-12-20 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | don't encode an UTF-8 encoded template | ||||
| * | | | don't encode an UTF-8 encoded template | Xu Pan | 2011-12-20 | 2 | -2/+3 |
| | | | | |||||
* | | | | Remove i18n dependencies from AP and AMo since they are in AS. | José Valim | 2011-12-20 | 2 | -2/+0 |
| | | | | |||||
* | | | | remove more uses of deprecated logger methods | Aaron Patterson | 2011-12-19 | 3 | -6/+8 |
| | | | | |||||
* | | | | Revert "Update .travis.yml" | Aaron Patterson | 2011-12-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This reverts commit ce0cf7d6fbb39a22a0563934abd8c02ff50dd14c. | ||||
* | | | | Update .travis.yml | Guillermo Iguaran | 2011-12-19 | 1 | -1/+0 |
| | | | | |||||
* | | | | * BufferedLogger is deprecated. Use ActiveSupport::Logger, or the logger | Aaron Patterson | 2011-12-19 | 17 | -180/+50 |
|/ / / | | | | | | | | | | from Ruby stdlib. | ||||
* | | | Party like its R-C-UNO! | David Heinemeier Hansson | 2011-12-19 | 9 | -9/+9 |
| | | | |||||
* | | | Add an invitation to use jbuilder, since we are not going to bundle it in 3.2 | David Heinemeier Hansson | 2011-12-19 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #4036 from Juanmcuello/database_tasks | Piotr Sarnacki | 2011-12-19 | 1 | -9/+22 |
|\ \ \ | | | | | | | | | Fix database tasks in test namespace. | ||||
| * | | | Fix database tasks in test namespace. | Juan M. Cuello | 2011-12-19 | 1 | -9/+22 |
| | |/ | |/| | | | | | | | | | | This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff that was reverted due to test failures, but now with a correction. | ||||
* / | | adding tests for #4029 | Aaron Patterson | 2011-12-19 | 2 | -1/+52 |
|/ / | |||||
* | | Revert "Merge pull request #4030 from Juanmcuello/database_tasks" | José Valim | 2011-12-19 | 1 | -20/+9 |
| | | | | | | | | | | This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad. | ||||
* | | Merge pull request #4030 from Juanmcuello/database_tasks | José Valim | 2011-12-19 | 1 | -9/+20 |
|\ \ | | | | | | | Fix database tasks in test namespace. | ||||
| * | | Fix database tasks in test namespace. | Juan M. Cuello | 2011-12-19 | 1 | -9/+20 |
|/ / |