Commit Graph

26420 Commits

Author SHA1 Message Date
Sergey Parizhskiy
0bcac982b6 Merge branch 'master' of github.com:lifo/docrails 2011-12-05 16:25:25 +02:00
Sergey Parizhskiy
c9cc535d2b changes in the way of how the stylesheets_link_tag works 2011-12-05 16:25:02 +02:00
Jason Noble
c921ba97b8 Remove redundant or 2011-12-05 05:22:13 -07:00
Vijay Dev
3134b467f0 Merge branch 'master' of github.com:lifo/docrails 2011-12-04 23:56:46 +05:30
José Valim
91a3e92cc2 Merge pull request #3850 from carlosantoniodasilva/readonly-attributes
Refactor readonly attributes conditional
2011-12-04 04:46:59 -08:00
Carlos Antonio da Silva
4e836e4de9 Refactor readonly attributes conditional 2011-12-04 09:21:34 -02:00
Vijay Dev
69341d3686 copy edits in the migrations guide 2011-12-04 16:29:11 +05:30
Xavier Noria
5dfdc69ef9 Merge pull request #3848 from arunagw/sqlite3_bump
SQlite3 Bump
2011-12-04 01:56:50 -08:00
Arun Agrawal
ac4763f5c0 SQlite3 Bump 2011-12-04 10:27:44 +05:30
Jason Noble
95213ac477 Be explicit about where to add/remove stuff to the migration 2011-12-03 19:31:45 -07:00
Jason Noble
b6d7ce9f23 Fix missing /ruby block 2011-12-03 19:31:45 -07:00
Jason Noble
718d0ea985 Be explicit of where the constraints are. 2011-12-03 19:31:45 -07:00
Jason Noble
914b85f124 Improve readability 2011-12-03 19:31:44 -07:00
Jason Noble
452b624e1e Be more friendly than "shut up" 2011-12-03 19:31:44 -07:00
Jason Noble
6589359ed1 A table format makes this section easier to read 2011-12-03 19:31:44 -07:00
Jason Noble
e9b3b9e5d8 This section is more about changing the output of running migrations 2011-12-03 19:31:44 -07:00
Jason Noble
d1ef1b2220 Improve readability 2011-12-03 19:31:44 -07:00
Jason Noble
90f18cc85e Readability improvements 2011-12-03 19:31:44 -07:00
Jason Noble
82ba3a79bf Move this into a section so that "Resetting the database" will show up in TOC 2011-12-03 19:31:44 -07:00
Jason Noble
d8c8bf5f05 Change wording to be more explicit on what migrating with a version does 2011-12-03 19:31:44 -07:00
Jason Noble
93d9845c30 Migrations can also run the "change" method 2011-12-03 19:31:44 -07:00
Jason Noble
4130fe3a5b Reword section to make it more readable. 2011-12-03 19:31:44 -07:00
Jason Noble
f41d099720 We're using methods, not writing them 2011-12-03 19:31:44 -07:00
Jason Noble
aca34b8e51 Change wording to be more understandable 2011-12-03 19:31:44 -07:00
Jason Noble
f7740f20f2 We're using the method, not writing it 2011-12-03 19:31:43 -07:00
Jason Noble
eedb863674 Change The other... to Another... 2011-12-03 19:31:43 -07:00
Jason Noble
74807383aa Reword confusing section 2011-12-03 19:31:43 -07:00
Jason Noble
a41295fdaa Correct grammatical errors 2011-12-03 19:31:43 -07:00
Jason Noble
bc6d1ebc66 It's more that Rails needs to know how to recreate the columns 2011-12-03 19:31:43 -07:00
Jason Noble
ec2727281c Added "also" to read better 2011-12-03 19:31:43 -07:00
Jason Noble
b3f8cbd9a8 Explain the t.timestamps method a little better 2011-12-03 19:31:43 -07:00
Jason Noble
1f765a2f72 Re-word confusing section 2011-12-03 19:31:43 -07:00
Jason Noble
c8f8ecfd38 Rollback is used elsewhere in the tutorial 2011-12-03 19:31:43 -07:00
Jason Noble
78f6672a43 Alphabetize fields to make reading easier 2011-12-03 19:31:43 -07:00
Jason Noble
f9cc3f0d8e Improve wording, fix some formatting issues 2011-12-03 19:31:43 -07:00
Jason Noble
9d87fb8f68 Constrained to 80 chars per line 2011-12-03 19:31:43 -07:00
Ryan Bigg
d7c2fcd856 Update layouts and rendering guide javascript_include_tag to bring it in line with Rails 3.1 2011-12-04 08:49:55 +11:00
Jon Leighton
e9b6659c4c Add missing require 2011-12-03 20:39:49 +00:00
Jon Leighton
3f23c049c2 Enable postgres on the CI ❤️ 🍺 2011-12-03 20:09:43 +00:00
Jon Leighton
51c2ef0b81 Avoid postgres 9.X syntax 2011-12-03 20:06:46 +00:00
Jon Leighton
9c172b2931 Fix #3837.
We also need to time zone convert time zone aware attributes when
accessed via read_attribute, not only when via direct access.
2011-12-03 16:46:46 +00:00
Xavier Noria
de24ed9f2d removes the convenience instance version of AR::Base.silence_auto_explain
Rationale: As discussed with José and Jon, this convenience
shortcut is not clearly justified and it could let the user
thing the disabled EXPLAINs are related to the model instance
rather than being globally disabled.
2011-12-03 14:26:34 +01:00
Jon Leighton
a02691ce09 Merge pull request #3820 from jaylevitt/nested_loading_through_assoc
reintroduce patch from #726 to handle nested eager loading via associations
2011-12-03 04:01:14 -08:00
Jon Leighton
2e902d52eb Merge pull request #3833 from kennyj/fix_3678-3
Use show create table (fix 3678: third time).
2011-12-03 03:36:00 -08:00
José Valim
75981a9208 Merge pull request #3842 from arunagw/app_gen_test
App Generator test
2011-12-03 02:45:22 -08:00
Arun Agrawal
c4f18683d9 Simplifying test in app/generator 2011-12-03 16:12:02 +05:30
José Valim
2ab2077235 Fix failing cascade exception. 2011-12-03 11:38:25 +01:00
Jon Jensen
0e17cf17eb Restore performance of ERB::Util.html_escape
Revert html_escape to do a single gsub again, but add the "n" flag (no
language, i.e. not multi-byte) to protect against XSS via invalid utf8

Signed-off-by: José Valim <jose.valim@gmail.com>
2011-12-03 10:36:52 +01:00
Vijay Dev
9ac6310bd9 fix a typo in query guide 2011-12-03 03:08:18 +05:30
Xavier Noria
3a967806ad yield > block.call 2011-12-02 11:44:04 -08:00