github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,024 Commits 34 Branches 105 Tags
68ba59fdbd1867a598959da7abbd798e85ba59dc
Commit Graph

18024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Noria
68ba59fdbd Merge remote branch 'rails/master' 2010-08-26 17:38:53 +02:00
Xavier Noria
d728f08580 getting started guide: revises text wrt bundler 2010-08-26 15:58:19 +02:00
Xavier Noria
5e0b70e6b5 revises a few link texts 2010-08-26 15:54:53 +02:00
Xavier Noria
c1b5e2a2d5 Merge remote branch 'rails/master' 2010-08-26 14:26:42 +02:00
Jaime Iniesta
e72406e2ba change 'a SQL' to 'an SQL' as suggested by the api documentation guidelines 2010-08-26 14:23:58 +02:00
Jaime Iniesta
5430f5bd06 lifecycle should be two words, life cycle 2010-08-26 14:23:58 +02:00
Jaime Iniesta
d9f6e16937 Fix capture_helper.rb api documentation, unescaped script tag was breaking it on the content_for explanation 2010-08-26 14:23:58 +02:00
Jaime Iniesta
0f9eedf6de change 'a SQL' to 'an SQL' as suggested by the api documentation guidelines 2010-08-26 10:16:08 +02:00
Jaime Iniesta
fa1ba5bd5b lifecycle should be two words, life cycle 2010-08-26 09:55:26 +02:00
Jaime Iniesta
5e73ab0936 Fix capture_helper.rb api documentation, unescaped script tag was breaking it on the content_for explanation 2010-08-26 09:01:59 +02:00
Xavier Noria
5dd92726a9 Merge remote branch 'docrails/master' 2010-08-26 01:59:31 +02:00
Xavier Noria
366e0fbd8d Revert "to_json => as_json" 
This reverts commit 7a6d8e4ad4.

Reason: The method that gives you a Ruby string with JSON source code is #to_json
 2010-08-26 01:56:56 +02:00
Xavier Noria
cd0267cd33 adds missing require for #parameterize 2010-08-26 01:56:10 +02:00
Xavier Noria
fa8e17b5c2 Merge remote branch 'docrails/master' 2010-08-26 01:39:16 +02:00
Aleksander Pohl
ee7507b38e - Fix non-ascii characters in headers 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-08-26 01:05:52 +02:00
James Miller
4b07bc8475 to_json => as_json 2010-08-25 15:23:21 -07:00
James Miller
7a6d8e4ad4 to_json => as_json 2010-08-25 14:55:24 -07:00
James Miller
26961bc836 Merge branch 'master' of github.com:lifo/docrails 2010-08-25 14:42:53 -07:00
James Miller
6e3c339ebe mysql2 is now the default, typos 2010-08-25 14:42:11 -07:00
James Miller
9be59e49bf Fix typo, favour => favor 2010-08-25 14:36:10 -07:00
Joost Baaij
a68919ec84 Restored top-level documentation for ActionController::Base. 
This information was lost in commit bd6b61be88.
This might have been intentional, but this class does represent the starting
point for all things related to actions, and as such should document it.

I couldn't find any trace of this documentation, which seems like a waste.
Updated parts here and there to conform to current best practices.
 2010-08-25 23:28:56 +02:00
Xavier Noria
d2f55e7eee AS guide: Array.wrap vs splat is only valid for 1.8 2010-08-25 20:30:06 +02:00
Joost Baaij
e9eaae1a05 fixed capitalization 2010-08-25 19:51:20 +02:00
Joost Baaij
eaeda503e8 change rdoc to conform to api guidelines 2010-08-25 18:57:27 +02:00
Andrew White
1fbb0684d2 Catch mysql2 access denied errors in rake db:create [#5432 state:resolved] 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-08-25 18:06:55 +02:00
Joost Baaij
111c4a4a01 remove unwanted linebreak 2010-08-25 17:20:55 +02:00
Rémy Coutable
43532f6b25 Restore consistency with the rest of the doc. 2010-08-25 15:55:53 +02:00
Rémy Coutable
58e2fa3695 Fixed a missing simple quote. 2010-08-25 15:52:43 +02:00
Aaron Patterson
ffdda4ddfb use blank? instead of present?, mark SQL literals as SQL literals 
Conflicts:

	activerecord/lib/active_record/relation/query_methods.rb
 2010-08-25 05:17:49 -07:00
Aaron Patterson
b28cafe01a no need to send on a public method 2010-08-25 05:17:49 -07:00
Aaron Patterson
ce7c2f72f4 refactor select { is_a? } to grep() 2010-08-25 05:17:49 -07:00
Aaron Patterson
e1e7122271 mark SQL literals as SQL literals 2010-08-25 05:17:49 -07:00
Neeraj Singh
4e40f00565 minor formatting fixes 2010-08-25 07:39:47 -04:00
Jakub Suder
4f945e97e5 better callstack reporting in deprecation messages 
now the reported line is the first line in the stack
that's outside Rails, which is the one that actually
caused the problem in the first place

[#5231 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-25 07:23:50 -03:00
Andrew White
0b9357d401 Remove rails info route from rake routes output [#5452 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-25 07:22:20 -03:00
Mikel Lindsaar
c1b49f1e18 Make ActiveResource::InvalidRequestError more user friendly 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-08-25 10:00:37 +02:00
Andrew White
1847d33b4b Use nested scope for routes defined at the :resources scope level (as in Rails 2.3) 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 21:15:13 -03:00
Xavier Noria
3ac6646d6f :nodoc:s #unscoped until its behavior is more clear, now sometimes works, sometimes not 2010-08-25 01:05:51 +02:00
Xavier Noria
a820bd9df6 edit pass to a recent doc patch 2010-08-25 00:22:53 +02:00
Xavier Noria
036f090df1 Merge remote branch 'docrails/master' 2010-08-25 00:17:02 +02:00
José Valim
80e1f730a2 Allow format to be skipped. This is used internally by mount. 2010-08-24 16:58:32 -03:00
José Valim
e197d6f34b Finally fix the bug where symbols and strings were not having the same behavior in the router. 
If you were using symbols before for methods like match/get/post/put/delete, it is likely that this commit will break your routes.
Everything should behave the same if you are using strings, if not, please open up a ticket.
 2010-08-24 16:58:25 -03:00
José Valim
4a90ecb3ad Ensure shortcuts inside resources also generates helpers. 2010-08-24 16:58:12 -03:00
José Valim
edba51cf33 Hide internal apps from rake routes [#5443 state:resolved] 2010-08-24 13:22:48 -03:00
Andrew White
1a6c81c4f9 Revert "Use symbols when specifying custom resource actions" 
This reverts commit 02aabbd19e.
 2010-08-24 17:12:02 +01:00
José Valim
2916521da8 Fix how routes inside namespaces are generated. 2010-08-24 13:05:29 -03:00
Santiago Pastorino
4df19b3f27 Allow actions which start with A-Za-z_ only 2010-08-24 12:43:43 -03:00
Aaron Suggs
3519d61af9 Bump rake dependency to 0.8.4. [#5279 state:resolved] 
This rake version adds the Rake::RDocTask#rdoc_task_name method, used in
railties/lib/rails/tasks/documentation.rake

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 11:57:30 -03:00
Neeraj Singh
747e0744dd @user.touch should not fail if User does not have updated_at/updated_on column. 
[#5439 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 11:24:32 -03:00
Andrew White
11f6179f55 Reset symbolized path parameters when a test request is recycled [#5437 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 11:24:32 -03:00