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
24,151 Commits 34 Branches 105 Tags
b033a248146d53c65a1680cdeb76b2035e670dfd
Commit Graph

24151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
b033a24814 Merge pull request #2258 from thedarkone/no-file-stat 
Use shorter class-level File methods instead of going through File.stat
 2011-07-25 08:13:21 -07:00
thedarkone
624b118616 Use shorter class-level File methods instead of going through File.stat. 2011-07-25 17:02:28 +02:00
Santiago Pastorino
64affc9384 Merge pull request #2236 from cldwalker/after_initialize 
Fix after_initialize and Base.create edge case
 2011-07-25 07:20:38 -07:00
José Valim
14c0f0ee12 Merge pull request #2254 from dmathieu/test_name 
provide more explicit test names
 2011-07-25 06:52:40 -07:00
Damien Mathieu
3348ea6254 provide more explicit test names 2011-07-25 15:25:22 +02:00
José Valim
451f63b42e Merge pull request #2247 from dmathieu/test_precompile_caching 
Add test checking that precompiling assets performs caching
 2011-07-25 05:36:00 -07:00
José Valim
a850cf7058 Merge pull request #2251 from thedarkone/update-all-order 
Bring back the ability to provide :order for update_all
 2011-07-25 05:03:28 -07:00
José Valim
dffd920432 Merge pull request #2252 from thedarkone/polymorphic-url-helpers 
Make polymorphic_url calls go through application helpers again.
 2011-07-25 05:02:00 -07:00
thedarkone
036f77574d Make polymorphic_url calls go through application helpers again. 
This brings back the ability to overwrite/extend url generating methods in application heleprs.
 2011-07-25 13:43:02 +02:00
thedarkone
10863580aa Bring back the ability to provide :order for update_all. 2011-07-25 13:33:44 +02:00
Damien Mathieu
07c9ff0b4a add test checking that precompiling assets performs caching 2011-07-25 10:32:03 +02:00
Aaron Patterson
02691d3516 Merge pull request #2238 from cesario/order-with-extra-spaces 
Ordering with extra spaces was raising a SQL exception
 2011-07-24 14:40:15 -07:00
Xavier Noria
12034516e2 Merge pull request #2243 from dmathieu/comment 
Help the next guy with explanations - See bb3b3e306
 2011-07-24 14:02:36 -07:00
Andrew White
0599e16dd9 Use top level Rails constant 2011-07-24 21:48:56 +01:00
Gabriel Horner
f5e4d13270 use existing model for testing Base.create with #after_initialize 2011-07-24 16:36:06 -04:00
Xavier Noria
4bb0a8bcbd Merge branch 'master' of git://github.com/lifo/docrails 2011-07-24 21:02:51 +02:00
Xavier Noria
0626668374 little details seen while reviewing 2011-07-24 21:01:53 +02:00
Damien Mathieu
ee56f7b8df help the next guy with explanations - See bb3b3e306 2011-07-24 20:52:08 +02:00
Jason Noble & Ralph Shnelvar
48e85d8b8c Moved ActionController, ActionView and ActionDispatch sections under ActionPack 2011-07-24 12:50:23 -06:00
Jason Noble & Ralph Shnelvar
5e8263b687 Add link to the Layouts and Rendering guide to explain more on view templates 2011-07-24 12:29:15 -06:00
Jason Noble & Ralph Shnelvar
f04725f3ba Modified the content based on vijaydev's comment 
3eb99aab77 (commitcomment-493737)
 2011-07-24 12:24:00 -06:00
Jason Noble & Ralph Shnelvar
8e44ff63b2 Update guide to be based on Rails 3.1. 2011-07-24 12:15:12 -06:00
Jason Noble & Ralph Shnelvar
25bcca139f Added link to the RubyGems User's Guide 2011-07-24 12:15:11 -06:00
Jason Noble & Ralph Shnelvar
bb746e3362 Added explanation to Components of Rails to help users not get hung up on details 2011-07-24 12:15:11 -06:00
Ken Ip
12955a393d Merge branch 'master' of https://github.com/lifo/docrails 2011-07-24 14:13:06 -04:00
Ken Ip
ce66fc047e Update "Getting Started" for Rails 3.1 
Add additional files generated by rails 3.1 generator.
 2011-07-24 14:12:15 -04:00
Jason Noble & Ralph Shnelvar
3eb99aab77 Added some context for rack apps, linked to the Rails on Rack guide. 2011-07-24 11:46:02 -06:00
Mike Howard
5712e7aa47 Clarified notes in 3.2 Creating the Blog Application 
Changed descriptino of Gemfile to add reference to Bundler
Changed description of README to add 'You should edit ...'
Changed description of Rakefile to reflect dynamic nature of Rakefile
and point to app/lib/tasks/ as the place to add app-specific rake tasks.
 2011-07-24 11:39:07 -06:00
Mike Howard
25850d17ac Changed wording of paragraph 2.1.1 Models to clarify table/model 
relationship.

changed wording 'one table ... corresponds to one model' to 'each table
...'
 2011-07-24 10:54:19 -06:00
Santiago Pastorino
97716e6273 Merge pull request #1186 from mitijain123/duplicable_test 
Duplicable test is looking fine now.
 2011-07-24 08:20:17 -07:00
Mitesh Jain
2c90568a06 Duplicable test is looking fine now. 2011-07-24 19:43:42 +05:30
Santiago Pastorino
8a9cacba6d Merge pull request #2239 from castlerock/scaffold_jquery 
fixing broken test as jquery-rails is included in application.js
 2011-07-24 06:55:25 -07:00
Mitesh Jain
fe37b48f28 Bringing back the jquery-rails. One test is dependent. 2011-07-24 19:18:49 +05:30
Xavier Noria
3665ffda83 Revert "Tests now require MySQL2 adapter in order to run" 
Reason: Setting up MySQL and Postgres needs installing servers
and libraries that perhaps you don't need in your machine. We
think fixing a bug in Active Support without running the suite
of Active Record for all possible drivers is OK. That's why
we explain first --without db, and after that we cover AR
specifically. mysql2 is no different than mysql or pg in that
sense.

This reverts commit 50d5e0f7e8.
 2011-07-24 11:40:06 +02:00
Oemuer Oezkir
ee5cfdf120 Missed a few instances of British English spelling in the last commit 
oh and obviously I meant according to Webster, not Weber
 2011-07-24 10:40:40 +00:00
Oemuer Oezkir
71d18ce48e Changed a few instances of of words in the API docs written in British English to 
American English(according to Weber)
 2011-07-24 10:21:42 +00:00
Franck Verrot
77bb0b79f2 Ordering with extra spaces was raising a SQL exception 2011-07-24 08:18:04 +02:00
Gabriel Horner
6e3c0a5d9a simplify and be more explicit about create and after_initialize tests 2011-07-24 00:31:37 -04:00
Les Fletcher
f956759f8a fix after_initialize edge case (close #2074 and close #2175) 
fix behavior when after_initialize is defined and a block is passed to Base.create
 2011-07-24 00:31:28 -04:00
Aaron Patterson
d33eb07543 Merge pull request #2233 from gramos/fix-issue-1951-master 
Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers
 2011-07-23 21:00:11 -07:00
Aaron Patterson
d89a33d162 just use normal ruby for stubbing 2011-07-23 20:55:29 -07:00
Gaston Ramos
dc1b0fd957 - added ActionView::PartialRenderer#merge_path_into_partial(path, partial) 
fix issues/1951
 2011-07-24 00:54:58 -03:00
Gaston Ramos
7621d131d2 - added test case for issue: 
https://github.com/rails/rails/issues/1951
  Namespaced model partial_path is wrong in namespaced controllers
 2011-07-24 00:54:45 -03:00
Aaron Patterson
a14f4566dd Merge pull request #2185 from castlerock/lazy_load_abstract_adapter 
lazy load ConnectionAdapters remove require.
 2011-07-23 20:51:43 -07:00
Aaron Patterson
9327b4de58 Merge pull request #2228 from Empact/helper_tags_in_mailers 
Simple fix to the NoMethodError noted in #2177.
 2011-07-23 20:40:12 -07:00
Aaron Patterson
cdc4274931 simplify singleton_class? method 2011-07-23 20:02:03 -07:00
Aaron Patterson
06c52d6ac9 Merge pull request #2226 from dmathieu/perform_caching 
rake assets:precompile should always perform caching - Closes #2199
 2011-07-23 17:50:43 -07:00
Ben Woosley
1f89898175 Simple fix to the NoMethodError noted in #2177. 
Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
 2011-07-23 17:31:48 -07:00
Damien Mathieu
bb3b3e3062 rake assets:precompile should always perform caching - Closes #2199 2011-07-24 01:32:14 +02:00
Santiago Pastorino
410e75419d Remove unused gems from Gemfile 2011-07-23 18:38:42 -03:00