aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4070 from lest/remove-require-enumeratorJosé Valim2011-12-201-2/+0
|\ | | | | requiring enumerator is not nessessary in ruby 1.9
| * requiring enumerator is not nessessary in ruby 1.9Sergey Nartimov2011-12-201-2/+0
| |
* | NullStore cache belongs in Active SupportVijay Dev2011-12-202-4/+2
|/
* Merge pull request #4061 from indrekj/action-mailer-18n-subject-commentsVijay Dev2011-12-201-1/+1
|\ | | | | fix default_i18n_subject comment in ActionMailer::Base
| * fix default_i18n_subject comment in ActionMailer::BaseIndrek Juhkam2011-12-201-1/+1
| |
* | Merge pull request #4035 from lest/date-type-castAaron Patterson2011-12-202-7/+19
|\ \ | | | | | | handle not only strings in date type cast
| * | handle not only strings in date type castSergey Nartimov2011-12-192-7/+19
| | |
* | | Remove dead code from AMo.José Valim2011-12-202-59/+37
| | |
* | | Remove more dead code from AS.José Valim2011-12-204-55/+17
| | |
* | | Merge pull request #4033 from nashby/date-helper-field-error-procJosé Valim2011-12-204-12/+35
|\ \ \ | | | | | | | | add failing tests for issue #3487
| * | | fix adding field_with_errors to date selects, closes #3487Vasiliy Ermolovich2011-12-203-11/+11
| | | |
| * | | add failing tests for issue #3487Vasiliy Ermolovich2011-12-191-1/+24
| |/ /
* | | Initial pass at removing dead 1.8.x code from Active Support.José Valim2011-12-2027-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 codeJosé Valim2011-12-2010-55/+13
| | |
* | | This test is rubbish.José Valim2011-12-201-39/+0
| | |
* | | Get rid of --old-style-hashJosé Valim2011-12-205-58/+6
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-205-12/+11
|\ \ \ | |_|/ |/| |
| * | remove unnecessary link. This is already mentioned in section 3 of the guideVijay Dev2011-12-201-3/+0
| | |
| * | Revert "Fixed some grammatical errors in ↵Vijay Dev2011-12-201-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 markupMikhail Dieterle2011-12-211-1/+1
| | |
| * | Revert "Updated RUNNING_UNIT_TESTS"Kristian Freeman2011-12-191-5/+2
| | | | | | | | | | | | | | | cp is not a valid command in DOS systems. This reverts commit 7d11c12958acf28ffb27d7e11a9c7f5b1418e77f.
| * | Updated RUNNING_UNIT_TESTSKristian Freeman2011-12-191-2/+5
| | |
| * | Removed period in comment regarding Levenshtein Wikipedia article to make a ↵Kristian Freeman2011-12-191-1/+1
| | | | | | | | | | | | valid URL.
| * | Fixed some grammatical errors in ↵Kristian Freeman2011-12-191-2/+3
| | | | | | | | | | | | raw_email_with_invalid_characters_in_content_type. Picky, I know.
| * | Fix syntax error in rdocs. Semyon Perepelitsa2011-12-201-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 Tambellini2011-12-191-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 Dev2011-12-187-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 infoPaco Guzman2011-12-187-5/+273
| | |
| * | Improve doc for ActiveRecord::Base.unscoped.Hendy Tanata2011-12-181-6/+8
| | |
* | | Update ruby_version_check.José Valim2011-12-202-14/+2
| | |
* | | rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+David Heinemeier Hansson2011-12-209-25/+25
| | |
* | | Merge pull request #4057 from joliss/gitignoreJosé Valim2011-12-202-0/+2
|\ \ \ | | | | | | | | Add db/*.sqlite3-journal to .gitignore
| * | | Add db/*.sqlite3-journal to .gitignoreJo Liss2011-12-202-0/+2
|/ / / | | | | | | | | | These can pop up while the SQLite DB is being written to.
* | | Remove deprecations from Active Support.José Valim2011-12-209-491/+0
| | |
* | | Remove deprecation warnings from Action Pack.José Valim2011-12-209-108/+6
| | |
* | | Remove deprecated layout lookup.José Valim2011-12-202-60/+27
| | |
* | | Merge pull request #4052 from lest/warning-variable-for-layoutJosé Valim2011-12-201-5/+6
|\ \ \ | | | | | | | | remove warnings about @variable_for_layout
| * | | remove warnings about @variable_for_layoutlest2011-12-201-5/+6
|/ / /
* | | Check if source is encoding aware.José Valim2011-12-201-32/+30
| | |
* | | Do not hard code encoding to UTF8José Valim2011-12-202-48/+54
| | |
* | | Merge pull request #4043 from cqpx/masterJosé Valim2011-12-202-2/+3
|\ \ \ | | | | | | | | don't encode an UTF-8 encoded template
| * | | don't encode an UTF-8 encoded templateXu Pan2011-12-202-2/+3
| | | |
* | | | Remove i18n dependencies from AP and AMo since they are in AS.José Valim2011-12-202-2/+0
| | | |
* | | | remove more uses of deprecated logger methodsAaron Patterson2011-12-193-6/+8
| | | |
* | | | Revert "Update .travis.yml"Aaron Patterson2011-12-191-0/+1
| | | | | | | | | | | | | | | | This reverts commit ce0cf7d6fbb39a22a0563934abd8c02ff50dd14c.
* | | | Update .travis.ymlGuillermo Iguaran2011-12-191-1/+0
| | | |
* | | | * BufferedLogger is deprecated. Use ActiveSupport::Logger, or the loggerAaron Patterson2011-12-1917-180/+50
|/ / / | | | | | | | | | from Ruby stdlib.
* | | Party like its R-C-UNO!David Heinemeier Hansson2011-12-199-9/+9
| | |
* | | Add an invitation to use jbuilder, since we are not going to bundle it in 3.2David Heinemeier Hansson2011-12-191-0/+3
| | |
* | | Merge pull request #4036 from Juanmcuello/database_tasksPiotr Sarnacki2011-12-191-9/+22
|\ \ \ | | | | | | | | Fix database tasks in test namespace.