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
23,747 Commits 34 Branches 105 Tags
fa1e3b2f46d4f70faf953533dd032aa950452908
Commit Graph

23747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Noria
fa1e3b2f46 let SDoc add a link to the source code in GitHub for each method 2011-08-29 15:48:20 -07:00
Igor Zubkov
609467263e Documentation fixes 2011-08-29 14:39:06 -07:00
Santiago Pastorino
c4ce550f3e bumping to 3.1.0.rc8 2011-08-29 00:10:06 -03:00
Santiago Pastorino
e4fc8e22c1 bumping to 3.1.0.rc7 2011-08-28 20:48:07 -03:00
Santiago Pastorino
3b13fb7c3f Merge pull request #2723 from guilleiguaran/3-1-0-changelogs 
Update changelogs for Rails 3.1.0
 2011-08-28 16:41:15 -07:00
Guillermo Iguaran
c677461dc7 Update Rails 3.1 CHANGELOGs 2011-08-28 18:32:23 -05:00
Santiago Pastorino
c13216b943 Bump rack-cache, rack-test, rack-mount and sprockets up 2011-08-28 19:05:21 -03:00
Aaron Patterson
a04503390f clear and disable query cache when an exception is raised from called middleware 2011-08-28 14:16:16 -07:00
Santiago Pastorino
cd00e3b89d assert_no_match 2011-08-27 22:33:38 -03:00
Xavier Noria
774832708d deletes spurious arrow 2011-08-27 15:35:44 -07:00
Xavier Noria
772173a656 use sdoc to generate the API 2011-08-27 03:56:32 -07:00
Andrew White
283f5971c6 Don't modify params in place - fixes #2624 2011-08-25 11:22:40 -03:00
Xavier Noria
5978faefd1 the command line guide is good to go 2011-08-24 14:46:13 -07:00
Aaron Patterson
93a9cadb7b load should also return the value from super 2011-08-24 13:30:16 -07:00
Aaron Patterson
b359628f18 require needs to return true or false. thank you Ryan "zenspider" Davis 2011-08-24 13:30:14 -07:00
Aaron Patterson
d7dc94a24b bumping bcrypt-ruby requirement 2011-08-24 13:29:06 -07:00
David Majda
621fe98166 Make ActionController::TestCase#recycle! set @protocol to nil 
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-08-24 14:06:22 -03:00
Andrew White
257061d730 Add failing test case for #2654 2011-08-24 14:06:13 -03:00
Joshua Peek
4327e2198e Bring in sprockets precompile task 2011-08-24 10:54:01 -05:00
Santiago Pastorino
19c14035a0 Merge pull request #2644 from guilleiguaran/allow-assets-debugging 
Add config.allow_debugging option
 2011-08-24 12:03:51 -03:00
Santiago Pastorino
8ac61f5b16 Merge pull request #2668 from guilleiguaran/debug-assets-media-type 
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
 2011-08-24 11:47:01 -03:00
Santiago Pastorino
8c0d89ee71 Merge pull request #2390 from arunagw/test_for_environment_file 
Test added to check development.rb, test.rb and production.rb content
 2011-08-24 11:23:52 -03:00
Santiago Pastorino
125b1b0b91 Merge pull request #2647 from dmathieu/no_rescue 
remove useless rescue
 2011-08-24 11:03:00 -03:00
Anand
25f60ccf1c added missing require array/wrap in serialization 2011-08-23 15:11:15 -07:00
Joost Baaij
0d9363d064 removed the link to my blog to help stop endless comments 2011-08-23 15:11:12 -07:00
Santiago Pastorino
b11308928b Merge pull request #2411 from ai/debug_assets_by_config 
Debug assets by config
 2011-08-22 15:53:00 -03:00
Aaron Patterson
1f1d4aa939 Merge branch '3-1-stable' into 3-1-0 
* 3-1-stable: (21 commits)
  Added a test to check for correct behaviour with no options in add_index command recorder
  Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
  Neatened up the invert_add_index method as per suggeston
  Simple fix for correctly inverting an add_index migration when a name has been provided
  Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
  Fix Sprockets rewrite_asset_path
  Merge pull request #2620 from cesario/3-1-0
  Fix sprockets warnings
  Use typewriter styling on url_for in documentation
  Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
  remove extra space since comment_if already returns the space. (cherry picked from commit 5e73a2fa50)
  Merge pull request #2596 from dharmatech/patch-1
  Merge pull request #2595 from smartinez87/assets-guide
  Merge pull request #2597 from dharmatech/patch-2
  Merge pull request #2604 from vijaydev/params_wrapper_docs
  Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
  Merge pull request #2603 from vijaydev/guides
  Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
  Revert "Deprecate the use of non-public methods by Module#delegate"
  mailer guide: fixes indentation, and use fixed width fonts wherever necessary
  ...
 2011-08-22 11:20:16 -07:00
David Workman
2f20c6c5ba Added a test to check for correct behaviour with no options in add_index command recorder 2011-08-22 11:04:41 -07:00
David Workman
00c8151d77 Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat 2011-08-22 11:04:31 -07:00
David Workman
9934c97cae Neatened up the invert_add_index method as per suggeston 2011-08-22 11:04:22 -07:00
David Workman
54866b0574 Simple fix for correctly inverting an add_index migration when a name has been provided 2011-08-22 11:04:13 -07:00
Santiago Pastorino
5ec3430a6e Merge pull request #2216 from martinisoft/remove_generated_whitespace 
Remove generated whitespace
 2011-08-22 10:43:18 -07:00
Santiago Pastorino
c2ab1b1cc3 Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 
Use mysql_creation_options inside rescue block
 2011-08-22 14:37:14 -03:00
Santiago Pastorino
9a26ba3b49 Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 
Use mysql_creation_options inside rescue block
 2011-08-22 14:36:42 -03:00
Guillermo Iguaran
812d1ae742 Fix Sprockets rewrite_asset_path 2011-08-22 12:25:06 -05:00
Santiago Pastorino
d81fe8d74e Merge pull request #2620 from cesario/3-1-0 
Fix CI and rename 1 misleading test case.
 2011-08-21 19:56:31 -03:00
Santiago Pastorino
9d1fc0863b Merge pull request #2620 from cesario/3-1-0 
Fix CI and rename 1 misleading test case.
 2011-08-21 15:55:15 -07:00
Joshua Peek
d7bef0a716 Fix sprockets warnings 
Fixes #2598
 2011-08-21 16:42:51 -05:00
Franck Verrot
2173e04ec6 Add a trailing space to the comment_if method 2011-08-21 22:47:57 +02:00
Franck Verrot
f63a1341a7 This is a test on --skip-sprockets, not --skip-active-record 
(cherry picked from commit 0c79098720e46e2a4a8380703ab9abc7dd0a4121)
 2011-08-21 22:47:04 +02:00
asmega
61fa6006db Use typewriter styling on url_for in documentation 2011-08-21 09:19:28 -07:00
asmega
1fd3c269a3 Use typewriter styling on url_for in documentation 2011-08-21 09:19:06 -07:00
Santiago Pastorino
7a6b220fda Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14 
Bump sprockets to 2.0.0.beta.14
 2011-08-21 11:36:52 -03:00
Santiago Pastorino
a79530a0a6 Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14 
Bump sprockets to 2.0.0.beta.14
 2011-08-21 11:36:23 -03:00
Santiago Pastorino
cc363855d2 Merge pull request #2615 from cesario/cherry_picks_on_rc6 
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
 2011-08-21 11:33:31 -03:00
Santiago Pastorino
fe7282e55c Merge pull request #2615 from cesario/cherry_picks_on_rc6 
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
 2011-08-21 07:32:50 -07:00
Teng Siong Ong
365ebdb1f2 remove extra space since comment_if already returns the space. 
(cherry picked from commit 5e73a2fa50)
 2011-08-21 11:08:51 +02:00
Santiago Pastorino
088f6f0c95 Merge pull request #2596 from dharmatech/patch-1 
ActionController::Redirecting : fix docs typo
 2011-08-20 18:29:32 -03:00
Santiago Pastorino
a0cb70644b Merge pull request #2595 from smartinez87/assets-guide 
Document debugging assets set by default for dev and test envs on guides
 2011-08-20 18:29:23 -03:00
Santiago Pastorino
a7ea1ffb1d Merge pull request #2597 from dharmatech/patch-2 
actionpack/lib/action_controller/base.rb: docs typo
 2011-08-20 18:29:02 -03:00