Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Updating newline fix to maintain existing linebreaks and indentation and ↵ | John Donahue | 2011-11-25 | 2 | -7/+10 | |
| | | | | | | | | | | | | test for b/eol on inserts | |||||
* | | | Merge pull request #3747 from lest/middleware-logger | José Valim | 2011-11-25 | 2 | -1/+3 | |
|\ \ \ | | | | | | | | | middlewares should have configurable logger | |||||
| * | | | middlewares should use logger from env | lest | 2011-11-25 | 2 | -1/+3 | |
| | | | | ||||||
* | | | | I suck, forgot to also change rake's task description | Piotr Sarnacki | 2011-11-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Display mounted engines in `rake routes` by default | Piotr Sarnacki | 2011-11-25 | 3 | -6/+2 | |
| | | | | ||||||
* | | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 11 | -8/+727 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | |||||
| * | | | | Add docs to serializers. Update CHANGELOGs. | José Valim | 2011-11-25 | 1 | -5/+7 | |
| | | | | | ||||||
| * | | | | Add a hook for serializers in the scaffold generator (off for now). | José Valim | 2011-11-25 | 3 | -1/+13 | |
| | | | | | ||||||
| * | | | | Add generators for serializers. | José Valim | 2011-11-25 | 6 | -0/+142 | |
| | | | | | ||||||
| * | | | | Remove listings from the serialization guide that won't make 3.2. | José Valim | 2011-11-23 | 1 | -37/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 79 | -2958/+3456 | |
| |\ \ \ \ | ||||||
| * | | | | | minor edits in serializers guide | Vijay Dev | 2011-10-15 | 1 | -9/+9 | |
| | | | | | | ||||||
| * | | | | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 1 | -0/+600 | |
| | | | | | | ||||||
* | | | | | | Added tests for #3751 | ganesh | 2011-11-25 | 2 | -2/+2 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Allow to display engine's routes when running `rake routes ENGINES=true` | Piotr Sarnacki | 2011-11-24 | 4 | -6/+70 | |
| | | | | | ||||||
* | | | | | Forgot to add CHANGELOG entry for config.railties_order | Piotr Sarnacki | 2011-11-24 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #3739 from lest/config-always-write-cookie | José Valim | 2011-11-23 | 1 | -0/+47 | |
|\ \ \ \ \ | | | | | | | | | | | | | configuration option to always write cookie | |||||
| * | | | | | configuration option to always write cookie | lest | 2011-11-23 | 1 | -0/+47 | |
| | | | | | | ||||||
* | | | | | | Allow to change engine's loading priority with config.railties_order= | Piotr Sarnacki | 2011-11-23 | 4 | -4/+173 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3731 from HeeL/master | Yehuda Katz | 2011-11-23 | 1 | -3/+14 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | code stats calculation | |||||
| * | | | | improved code stats calculation, check on multiline comments and rewrite ↵ | Sergey Parizhskiy | 2011-11-23 | 1 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | regexps according to a class naming convention | |||||
* | | | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 4 | -21/+34 | |
|/ / / / | | | | | | | | | | | | | methods directly. | |||||
* | | | | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 3 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | stylesheet_tag default's media is "screen" | |||||
| * | | | | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | default generators. | |||||
* | | | | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Remove the -h option to dbconsole which is the shorter form of --header | Vijay Dev | 2011-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done since the -h option to dbconsole hides the conventional -h for help and forces users to use --help to see the usage options for dbconsole. | |||||
* | | | | | fix warning about instance variable in plugin generator | lest | 2011-11-19 | 1 | -7/+7 | |
| | | | | | ||||||
* | | | | | fix rails plugin new CamelCasedName bug | lest | 2011-11-19 | 2 | -4/+22 | |
| | | | | | | | | | | | | | | | | | | | | refs #3684 | |||||
* | | | | | mailer guide - update info about using default host. Fixes #3642 | Vijay Dev | 2011-11-19 | 1 | -11/+4 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-18 | 5 | -12/+12 | |
|\ \ \ \ | ||||||
| * | | | | remove unneeded params from issue tracker url | Vijay Dev | 2011-11-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Guides: better example to find the last sent email | Sunny Ripert | 2011-11-17 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | "denoted" instead of "donated" | capps | 2011-11-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | "parentheses" instead of "use brackets" | |||||
| * | | | | added comma | rpq | 2011-11-15 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
| * | | | made url to a github issues a bit shorter - no need in a page param when ↵ | Sergey Parizhskiy | 2011-11-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | it's a first page | |||||
| * | | | Move tooltip on re-running rails new with a different --database option | Jason Noble | 2011-11-13 | 1 | -8/+8 | |
| | | | | ||||||
* | | | | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 1 | -12/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b. | |||||
* | | | | warn the user values are directly interpolated into _html translation strings | Xavier Noria | 2011-11-17 | 1 | -0/+12 | |
| | | | | ||||||
* | | | | update guide: db:structure:dump produces structure.sql now | Vijay Dev | 2011-11-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Move schema_format :sql config setting from test.rb to application.rb | Alex Tambellini | 2011-11-17 | 4 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | I've moved the schema_format :sql config setting to application.rb because you would never enable this only for the test environment. If you use database constraints or database specific data types you would want all of your environments to use them. | |||||
* | | | | Merge pull request #3608 from arunagw/unused_var_remove | Jon Leighton | 2011-11-16 | 2 | -2/+1 | |
|\ \ \ \ | | | | | | | | | | | Unused variable removed | |||||
| * | | | | Unused variable removed | Arun Agrawal | 2011-11-15 | 2 | -2/+1 | |
| | | | | | ||||||
* | | | | | Substituted RailsCommands for Rails::Commands | Daniel Dyba | 2011-11-16 | 1 | -159/+161 | |
| | | | | | ||||||
* | | | | | Changed Commands module to RailsCommands. | Daniel Dyba | 2011-11-16 | 1 | -3/+3 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | This is to avoid a conflict that occurs when you add Rake to your Gemfile. There is a Commands Object in Rake that conflicts with the Commands module in plugin.rb. See rails issue #1866. | |||||
* | | | | Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile | José Valim | 2011-11-14 | 2 | -0/+8 | |
|\ \ \ \ | | | | | | | | | | | Added therubyrhino to default Gemfile under JRuby | |||||
| * | | | | Added therubyrhino to default Gemfile under JRuby | Guillermo Iguaran | 2011-11-14 | 2 | -0/+8 | |
| | | | | | ||||||
* | | | | | Sync CHANGELOGs from 3-1-stable | Jon Leighton | 2011-11-14 | 1 | -0/+10 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-13 | 4 | -76/+92 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | copy edits in getting started guide | Vijay Dev | 2011-11-13 | 1 | -15/+12 | |
| | | | | ||||||
| * | | | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ↵ | Vijay Dev | 2011-11-13 | 1 | -18/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next section" This reverts commit 4bf057b8661754948681a18cf17ff5676518d774. Reason: Prefer to keep the configuration of all databases at the same level |