Commit Graph

7476 Commits

Author SHA1 Message Date
José Valim
6f5fdf8179 Merge pull request #3747 from lest/middleware-logger
middlewares should have configurable logger
2011-11-25 05:33:26 -08:00
Piotr Sarnacki
8ff8fa5e5f I suck, forgot to also change rake's task description 2011-11-25 12:54:39 +01:00
Piotr Sarnacki
c9bb099318 Display mounted engines in rake routes by default 2011-11-25 12:45:58 +01:00
lest
cd9d28d6fd middlewares should use logger from env 2011-11-25 13:09:46 +03:00
José Valim
fcacc6986a Merge branch 'serializers'
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.

From José and Yehuda with love.

Conflicts:
	railties/CHANGELOG.md
2011-11-25 09:59:35 +00:00
José Valim
696d01f7f4 Add docs to serializers. Update CHANGELOGs. 2011-11-25 09:49:54 +00:00
ganesh
c8d7291b6b Added tests for #3751 2011-11-25 14:55:28 +05:30
José Valim
6d9f9b3b05 Add a hook for serializers in the scaffold generator (off for now). 2011-11-25 09:17:32 +00:00
José Valim
ebb8ea22f3 Add generators for serializers. 2011-11-25 09:14:05 +00:00
Piotr Sarnacki
0cd3bf8406 Allow to display engine's routes when running rake routes ENGINES=true 2011-11-24 16:16:00 +01:00
Piotr Sarnacki
a478389b7d Forgot to add CHANGELOG entry for config.railties_order 2011-11-24 13:40:27 +01:00
José Valim
6da52c617e Remove listings from the serialization guide that won't make 3.2. 2011-11-23 23:22:46 +00:00
José Valim
e6cfd85361 Merge pull request #3739 from lest/config-always-write-cookie
configuration option to always write cookie
2011-11-23 12:58:56 -08:00
lest
98a1717e7c configuration option to always write cookie 2011-11-23 23:50:04 +03:00
José Valim
e62de52aa3 Merge branch 'master' into serializers 2011-11-23 20:43:06 +00:00
Piotr Sarnacki
40b19e0635 Allow to change engine's loading priority with config.railties_order= 2011-11-23 21:36:33 +01:00
Yehuda Katz
8549f7a4f0 Merge pull request #3731 from HeeL/master
code stats calculation
2011-11-23 11:11:40 -08:00
José Valim
fd86a1b6b0 Rely on a public contract between railties instead of accessing railtie methods directly. 2011-11-23 19:06:45 +00:00
Sergey Parizhskiy
d78a7026fc improved code stats calculation, check on multiline comments and rewrite regexps according to a class naming convention 2011-11-23 14:10:30 +02:00
Yehuda Katz
9b7be78820 Merge pull request #3724 from marcandre/media_default
stylesheet_tag default's media is "screen"
2011-11-22 12:38:05 -08:00
Marc-Andre Lafortune
05e02deb68 Make explicit the default media when calling stylesheet_tag and change the default generators. 2011-11-22 15:16:23 -05:00
lest
a9e8cf78fd add ActionController::Metal#show_detailed_exceptions? 2011-11-22 11:38:24 +03:00
Vijay Dev
4c872c017b Remove the -h option to dbconsole which is the shorter form of --header
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.
2011-11-22 00:05:46 +05:30
lest
c220b4d833 fix warning about instance variable in plugin generator 2011-11-19 21:58:30 +03:00
lest
39d2251d8a fix rails plugin new CamelCasedName bug
refs #3684
2011-11-19 19:09:09 +02:00
Vijay Dev
dda6787f44 mailer guide - update info about using default host. Fixes #3642 2011-11-19 00:07:50 +05:30
Vijay Dev
48b580a03b Merge branch 'master' of github.com:lifo/docrails 2011-11-18 23:11:46 +05:30
Vijay Dev
9d035292ba remove unneeded params from issue tracker url 2011-11-18 23:10:12 +05:30
Xavier Noria
1079724fe6 Revert "warn the user values are directly interpolated into _html 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.
2011-11-17 23:59:19 +01:00
Xavier Noria
d57d8098fc warn the user values are directly interpolated into _html translation strings 2011-11-17 23:07:06 +01:00
Vijay Dev
9b534060bf update guide: db:structure:dump produces structure.sql now 2011-11-18 01:17:21 +05:30
Sunny Ripert
8d17af23ef Guides: better example to find the last sent email 2011-11-17 17:05:53 +01:00
Alex Tambellini
0af93089de Move schema_format :sql config setting from test.rb to application.rb
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.
2011-11-17 09:44:17 -05:00
capps
64a3175eea "denoted" instead of "donated"
"parentheses" instead of "use brackets"
2011-11-16 15:57:54 -08:00
Jon Leighton
a152fd34d3 Merge pull request #3608 from arunagw/unused_var_remove
Unused variable removed
2011-11-16 14:57:48 -08:00
Daniel Dyba
325abe9fba Substituted RailsCommands for Rails::Commands 2011-11-16 10:26:28 -08:00
Daniel Dyba
21c5a0a104 Changed Commands module to RailsCommands.
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.
2011-11-16 10:23:00 -08:00
rpq
bc00514b62 added comma 2011-11-15 23:20:21 -05:00
Sergey Parizhskiy
df08273d14 made url to a github issues a bit shorter - no need in a page param when it's a first page 2011-11-15 13:09:41 +02:00
Arun Agrawal
76b6027cd8 Unused variable removed 2011-11-15 13:23:27 +05:30
José Valim
2088f1b3b4 Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile
Added therubyrhino to default Gemfile under JRuby
2011-11-14 09:53:57 -08:00
Guillermo Iguaran
49cd6a0ff7 Added therubyrhino to default Gemfile under JRuby 2011-11-14 07:07:38 -05:00
Jon Leighton
da02f792fe Sync CHANGELOGs from 3-1-stable 2011-11-14 11:28:12 +00:00
Jason Noble
8971cca7d0 Move tooltip on re-running rails new with a different --database option 2011-11-13 10:20:03 -07:00
Vijay Dev
e0efe48c45 Merge branch 'master' of github.com:lifo/docrails 2011-11-13 22:29:26 +05:30
Vijay Dev
30122307a1 copy edits in getting started guide 2011-11-13 22:27:44 +05:30
Vijay Dev
af51409de4 Revert "Move Tip up higher so users who are fine with SQLite can skip to the next section"
This reverts commit 4bf057b8661754948681a18cf17ff5676518d774.

Reason: Prefer to keep the configuration of all databases at the same
level
2011-11-13 22:07:54 +05:30
Vijay Dev
c8c08bd000 Revert "Use rails help new instead of rails new -h"
This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c.
2011-11-13 21:57:39 +05:30
Vijay Dev
e1099eb4fd Revert "Update guide to use Ruby 1.9 hash syntax"
This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909.

Reason: Let's keep the guides at 1.8 syntax
2011-11-13 21:50:18 +05:30
Jason Noble
50a9de514f Update guide to use Ruby 1.9 hash syntax 2011-11-13 03:15:56 -07:00