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,621 Commits 34 Branches 105 Tags
bb4e790dff3b345b4080263eb0b17da172b6e67f
Commit Graph

24621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
bb4e790dff Merge pull request #2539 from arunagw/delegate_expl 
Delegate expl
 2011-08-15 13:32:52 -07:00
Arun Agrawal
83eec4ca4c Requiring delegate. 2011-08-16 01:36:21 +05:30
Jon Leighton
b2469283a7 Removing unnecessary require, solve 'circular require considered harmful' warning. 2011-08-16 01:32:52 +05:30
Santiago Pastorino
fd29b4e47f Fix typo 2011-08-15 15:35:47 -03:00
Santiago Pastorino
4ca605b71b rake assets:precompile executes in production environment as default if RAILS_ENV was not provided 2011-08-15 15:31:47 -03:00
Santiago Pastorino
b01cc2241c Merge pull request #2536 from arunagw/unused_var 
Unused variable removed.
 2011-08-15 10:55:52 -07:00
Jon Leighton
ebb2e9423f Update travis config on @joshk's instructions 2011-08-15 17:23:15 +01:00
Arun Agrawal
45ccd64866 Unused variable removed. 2011-08-15 21:49:12 +05:30
Jon Leighton
c80876f778 Document Object#public_send 2011-08-15 16:26:37 +01:00
Jon Leighton
2e2f3f5a46 Add a test for delegating a method ending in '=' as this is a special case. 2011-08-15 16:07:49 +01:00
Jon Leighton
57423d815b Ensure empty has_many :through association preloaded via joins is marked as loaded. Fixes #2054. 2011-08-15 16:01:01 +01:00
Jon Leighton
4c743d9fce Merge pull request #2534 from arunagw/public_send_require 
Need to include public_send
 2011-08-15 06:46:59 -07:00
Arun Agrawal
10b99f2826 Need to include public_send 2011-08-15 19:13:25 +05:30
Jon Leighton
27da0c5480 Split up the definitions in Module#delegate depending on :allow_nil, and don't use exceptions for flow control in the :allow_nil => true case. 2011-08-15 13:56:04 +01:00
Jon Leighton
63d100ea35 Fix the line number in the backtrace when Module#delegate raises 2011-08-15 13:03:28 +01:00
Jon Leighton
7b56fb034a Fix private methods which are delegated to. This previously worked because Module#delegate previously ignored method visibility. 2011-08-15 12:38:44 +01:00
Jon Leighton
8bba95f293 Just do the method call directly in Module#delegate, if we can (we cannot for method names ending in '='). Two reasons: 1) it's faster, see https://gist.github.com/1089783 and 2) more importantly, delegate should not allow you to accidentally call private or protected methods. 2011-08-15 12:38:38 +01:00
Jon Leighton
6f4b405250 Backport Object#public_send to 1.8 so that we can implement Module#delegate such that non-public methods raise 2011-08-15 12:08:23 +01:00
José Valim
652ab436db Ensure changing RAILS_GROUPS will load the proper dependencies. 2011-08-14 10:52:46 -07:00
José Valim
99f87c9ad3 Merge pull request #2527 from cesario/fix_2511 
Methods like status and location are interfering with redirect_to [Closes #2511]
 2011-08-14 10:04:14 -07:00
Franck Verrot
75dd33a0ae Methods like status and location are interfering with redirect_to [Closes #2511] 2011-08-14 19:00:30 +02:00
Xavier Noria
bf2b9d2de3 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	RELEASING_RAILS.rdoc
	actionpack/lib/sprockets/railtie.rb
	actionpack/test/template/sprockets_helper_test.rb
	activerecord/test/cases/calculations_test.rb
	railties/guides/source/3_1_release_notes.textile
	railties/guides/source/active_resource_basics.textile
	railties/guides/source/command_line.textile
 2011-08-13 16:30:07 -07:00
Waynn Lue
f566fb32c4 "suits" is correct here, not "suites" 2011-08-13 16:22:35 -07:00
Oge Nnadi
aa0d3cece8 Typo fix 2011-08-13 16:22:35 -07:00
Sebastian Martinez
0196f0feb1 Some fixes on the 3_1_release_notes guide. 2011-08-13 16:22:35 -07:00
geemus
53e1a9d411 update abstract_controller callbacks to document meta-programmed filters 2011-08-13 16:22:35 -07:00
Vishnu Atrai
54cd73e20d ActiveModel::Validations basic guide 2011-08-13 16:22:35 -07:00
Florent Guilleux
56efdbc626 Document exclamation point on dynamic finders 2011-08-13 16:22:34 -07:00
Emili Parreño
1b0d03b5db update rails on rack guide, section 2 needs to be changed or maybe deleted 2011-08-13 16:22:34 -07:00
Mr. Wolfe
635c1ca007 Revert "update rails on rack guide, section 2 needs to be changed or maybe deleted" 
This reverts commit 7a4e545eccf834cb620df0f909ef3f4bec4e6608.
 2011-08-13 16:22:34 -07:00
Mr. Wolfe
3b4e7c9f8e update rails on rack guide, section 2 needs to be changed or maybe deleted 2011-08-13 16:22:34 -07:00
Waynn Lue
76158146eb comma is more appropriate here 2011-08-13 16:22:34 -07:00
Floris Huetink
9cf56c709b Fixed typo (attachments method name was missing an s) in Action Mailer basics guide 2011-08-13 16:22:34 -07:00
Tate Johnson
239e615316 Fixed typo 2011-08-13 16:22:33 -07:00
Richard Hulse
49e81f21a3 [asset pipeline] update snippet to reflect patch 
Two commented lines in example to match the
commit (8845ae683e)
 2011-08-13 16:22:33 -07:00
Richard Hulse
32da2f864e [asset pipeline] update to reflect new sendfile header default 
X-Sendfile headers are now set to nil and are off by default.
See commit eff7fddeb2
 2011-08-13 16:22:33 -07:00
Vijay Dev
93ec7bb59a 3.1 release notes: fixed font changes 2011-08-13 16:22:33 -07:00
ov3y
8c133fc4c0 Point to current, official upgrade plugin 2011-08-13 16:22:33 -07:00
Richard Hulse
b840d71bfb [asset pipeline] Update Capistrano info 
v2.8.0 of Capistrano has a recipe to handle precompile
and symlinking.
 2011-08-13 16:22:33 -07:00
Vijay Dev
dbf22560c6 3.1 release notes: organize action_pack notes 2011-08-13 16:22:32 -07:00
JudeArasu
8320fbb3b0 prototype switch 2011-08-13 16:22:32 -07:00
Vijay Dev
31b820eef9 expand tmp:* tasks, and a few more additions in the command line guide 2011-08-13 16:22:32 -07:00
Vijay Dev
bc9eaf422d indentation fixes 2011-08-13 16:22:32 -07:00
Sukeerthi Adiga G
86ae14df47 Dirty object methods added to active model basics 2011-08-13 16:22:32 -07:00
Vishnu Atrai
a3cf68291d ActiveModel::Conversion basic guide 2011-08-13 16:22:32 -07:00
Vishnu Atrai
d5adaf2d38 ActiveModel::Callbacks basic guide 2011-08-13 16:22:32 -07:00
Vishnu Atrai
33d7a6bc55 ActiveModel::Callbacks basic guide 2011-08-13 16:22:31 -07:00
Richard Hulse
bc49d6d1eb [asset pipeline] fixed example 
Changed << to += because we are _concatenating_
this new array to the end of config array, NOT
pushing this array in it.
 2011-08-13 16:22:31 -07:00
Sukeerthi Adiga
b905f8c963 Rubygems => RubyGems 2011-08-13 16:22:31 -07:00
Waynn Lue
2579d88405 capitalize RubyGems properl 2011-08-13 16:22:31 -07:00