aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Updating newline fix to maintain existing linebreaks and indentation and ↵John Donahue2011-11-252-7/+10
| | | | | | | | | | | | test for b/eol on inserts
* | | Merge pull request #3747 from lest/middleware-loggerJosé Valim2011-11-252-1/+3
|\ \ \ | | | | | | | | middlewares should have configurable logger
| * | | middlewares should use logger from envlest2011-11-252-1/+3
| | | |
* | | | I suck, forgot to also change rake's task descriptionPiotr Sarnacki2011-11-251-1/+1
| | | |
* | | | Display mounted engines in `rake routes` by defaultPiotr Sarnacki2011-11-253-6/+2
| | | |
* | | | Merge branch 'serializers'José Valim2011-11-2511-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é Valim2011-11-251-5/+7
| | | | |
| * | | | Add a hook for serializers in the scaffold generator (off for now).José Valim2011-11-253-1/+13
| | | | |
| * | | | Add generators for serializers.José Valim2011-11-256-0/+142
| | | | |
| * | | | Remove listings from the serialization guide that won't make 3.2.José Valim2011-11-231-37/+0
| | | | |
| * | | | Merge branch 'master' into serializersJosé Valim2011-11-2379-2958/+3456
| |\ \ \ \
| * | | | | minor edits in serializers guideVijay Dev2011-10-151-9/+9
| | | | | |
| * | | | | Initial commit of serializer supportJose and Yehuda2011-10-151-0/+600
| | | | | |
* | | | | | Added tests for #3751ganesh2011-11-252-2/+2
| |_|/ / / |/| | | |
* | | | | Allow to display engine's routes when running `rake routes ENGINES=true`Piotr Sarnacki2011-11-244-6/+70
| | | | |
* | | | | Forgot to add CHANGELOG entry for config.railties_orderPiotr Sarnacki2011-11-241-0/+4
| | | | |
* | | | | Merge pull request #3739 from lest/config-always-write-cookieJosé Valim2011-11-231-0/+47
|\ \ \ \ \ | | | | | | | | | | | | configuration option to always write cookie
| * | | | | configuration option to always write cookielest2011-11-231-0/+47
| | | | | |
* | | | | | Allow to change engine's loading priority with config.railties_order=Piotr Sarnacki2011-11-234-4/+173
|/ / / / /
* | | | | Merge pull request #3731 from HeeL/masterYehuda Katz2011-11-231-3/+14
|\ \ \ \ \ | |_|/ / / |/| | | | code stats calculation
| * | | | improved code stats calculation, check on multiline comments and rewrite ↵Sergey Parizhskiy2011-11-231-3/+14
| | | | | | | | | | | | | | | | | | | | regexps according to a class naming convention
* | | | | Rely on a public contract between railties instead of accessing railtie ↵José Valim2011-11-234-21/+34
|/ / / / | | | | | | | | | | | | methods directly.
* | | | Merge pull request #3724 from marcandre/media_defaultYehuda Katz2011-11-223-3/+3
|\ \ \ \ | | | | | | | | | | stylesheet_tag default's media is "screen"
| * | | | Make explicit the default media when calling stylesheet_tag and change the ↵Marc-Andre Lafortune2011-11-223-3/+3
| | | | | | | | | | | | | | | | | | | | default generators.
* | | | | add ActionController::Metal#show_detailed_exceptions?lest2011-11-221-1/+1
| | | | |
* | | | | Remove the -h option to dbconsole which is the shorter form of --headerVijay Dev2011-11-221-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 generatorlest2011-11-191-7/+7
| | | | |
* | | | | fix rails plugin new CamelCasedName buglest2011-11-192-4/+22
| | | | | | | | | | | | | | | | | | | | refs #3684
* | | | | mailer guide - update info about using default host. Fixes #3642Vijay Dev2011-11-191-11/+4
| |_|/ / |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-185-12/+12
|\ \ \ \
| * | | | remove unneeded params from issue tracker urlVijay Dev2011-11-181-1/+1
| | | | |
| * | | | Guides: better example to find the last sent emailSunny Ripert2011-11-171-1/+1
| | | | |
| * | | | "denoted" instead of "donated"capps2011-11-161-1/+1
| | | | | | | | | | | | | | | "parentheses" instead of "use brackets"
| * | | | added commarpq2011-11-151-1/+1
| | |_|/ | |/| |
| * | | made url to a github issues a bit shorter - no need in a page param when ↵Sergey Parizhskiy2011-11-151-1/+1
| | | | | | | | | | | | | | | | it's a first page
| * | | Move tooltip on re-running rails new with a different --database optionJason Noble2011-11-131-8/+8
| | | |
* | | | Revert "warn the user values are directly interpolated into _html ↵Xavier Noria2011-11-171-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 stringsXavier Noria2011-11-171-0/+12
| | | |
* | | | update guide: db:structure:dump produces structure.sql nowVijay Dev2011-11-181-1/+1
| | | |
* | | | Move schema_format :sql config setting from test.rb to application.rbAlex Tambellini2011-11-174-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_removeJon Leighton2011-11-162-2/+1
|\ \ \ \ | | | | | | | | | | Unused variable removed
| * | | | Unused variable removedArun Agrawal2011-11-152-2/+1
| | | | |
* | | | | Substituted RailsCommands for Rails::CommandsDaniel Dyba2011-11-161-159/+161
| | | | |
* | | | | Changed Commands module to RailsCommands.Daniel Dyba2011-11-161-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-gemfileJosé Valim2011-11-142-0/+8
|\ \ \ \ | | | | | | | | | | Added therubyrhino to default Gemfile under JRuby
| * | | | Added therubyrhino to default Gemfile under JRubyGuillermo Iguaran2011-11-142-0/+8
| | | | |
* | | | | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-141-0/+10
| |/ / / |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-134-76/+92
|\ \ \ \ | |/ / / |/| | |
| * | | copy edits in getting started guideVijay Dev2011-11-131-15/+12
| | | |
| * | | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ↵Vijay Dev2011-11-131-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next section" This reverts commit 4bf057b8661754948681a18cf17ff5676518d774. Reason: Prefer to keep the configuration of all databases at the same level