github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 00:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,809 Commits 34 Branches 105 Tags
bfb54aefa6bbff194eeb81b8e797ddde24aaae95
Commit Graph

6809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
bfb54aefa6 Clarify confusing ActionController::Base.allow_concurrency flag. 2008-04-28 22:10:19 -07:00
Jeremy Kemper
1c66ece244 Note that allow_concurrency = true means you need to verify_active_connections! to clear out connections assigned to stale threads. 2008-04-28 22:05:06 -07:00
Jeremy Kemper
90f6062f7d run prepare callbacks after after_initialize blocks so config.to_prepare actually works 2008-04-28 12:02:50 -07:00
David Heinemeier Hansson
9a80e97d58 Merge branch 'master' of git@github.com:rails/rails 2008-04-28 13:29:23 -05:00
David Heinemeier Hansson
0a6980f2dc Let Base.all use conditions etc like first/last 2008-04-28 13:27:52 -05:00
Jeremy Kemper
642bcd2d01 Ruby 1.9 compat: force assert_select text encoding to the encoding of the regexp it's matching against. 2008-04-28 10:52:23 -07:00
Michael Koziarski
8af98c3f81 Revert alias_method_chain exceptions as they broke aliasing class methods. 
This reverts commit be48cad9a4.
 2008-04-28 16:54:09 +12:00
John Barnette
be48cad9a4 Make alias_method_chain complain about duplicate aliases. Previously 
repeated calls to alias_method_chain would cause infinite loops.

Signed-Off-By: Michael Koziarski <michael@koziarski.com>
 2008-04-28 16:23:46 +12:00
David Heinemeier Hansson
850aba5473 Fixed that BenchmarkHelper should use controller.logger instead of @logger (which now apparently is gone) 2008-04-27 22:46:19 -05:00
David Heinemeier Hansson
dc2d693014 Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH] 2008-04-27 19:42:13 -05:00
David Heinemeier Hansson
027f0f822f Merge branch 'master' of git@github.com:rails/rails 2008-04-27 17:16:05 -05:00
David Heinemeier Hansson
162c7c1908 Changing "and" to && whereever I catch it 2008-04-27 17:15:50 -05:00
John Barnette
7f4171da5e Be friendlier when upgrading apps with an old boot.rb. 
If Rails doesn't respond to vendor_rails?, abort with an error asking
the user to run 'rake rails:update'.

Signed-Off-By: Michael Koziarski <michael@koziarski.com>
 2008-04-28 09:16:13 +12:00
Aliaksey Kandratsenka
361aaa04ef Remove old :limit removal code from find_initial, logic is now handled in the preloading and eager loading code. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-27 20:01:05 +12:00
Michael Koziarski
f3fd44f76b Add default options to file_store to make it align with the other cache stores. [monki] 
[#40 state:resolved]
 2008-04-26 12:21:36 +12:00
Frederick Cheung
44d2142352 Ensure table names are quoted by the association preloading code. 
[#45 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-26 12:14:50 +12:00
David Heinemeier Hansson
a37546517d Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [DHH] 2008-04-25 16:33:00 -05:00
Pratik Naik
1959db3246 Pass template object to Handler#compile 2008-04-24 16:58:09 +01:00
Joshua Peek
a0748848b6 Use .gitignore as the convention for dummy file names. 2008-04-24 09:20:04 -05:00
David Dollar
6c1c16bfd9 Fixes a subtle bug when using symbols for key definitions in habtm associations 2008-04-23 21:02:00 +12:00
Sam Granieri
30ad1827a6 preventing generated documentation from being picked up by git. [#37 state:resolved] 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-23 20:27:23 +12:00
Eugene Pimenov
e6a3ce3392 Make sure member names aren't mistakenly set to nil when providing :path_names 
[#19 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-23 20:19:22 +12:00
Joshua Bates
b6aa0e13b4 Fix include? on has_many collections with finder_sql to fall back to Array include? rather than try to use SQL. 
[#18 state:resolved]
 2008-04-23 20:18:09 +12:00
Frederick Cheung
ae51013c3f Provide data for the key column otherwise adding a unique index will fail. [#30 state:closed] 2008-04-23 14:24:20 +12:00
Francesc Esplugas
bf1b1e0925 Rails Edge info returns the latest git commit hash [#36 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-04-22 15:44:13 -05:00
Frederick Cheung
a4fc93c3a9 Use schema.rb for all databases 
Move adapter specific schema into their own files

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-22 13:55:13 +12:00
Joshua Peek
0a94f16b95 Fallback to Ruby's pseudo random number generator if the system does not have SHA512 installed. 2008-04-21 19:49:16 -05:00
Joshua Peek
de8b0087c6 Don't require generator_test_helper in RailsGeneratorTest. 2008-04-21 19:14:37 -05:00
Joshua Peek
6ccfc0ebde Add .empty files to empty directories so git preserves them. 2008-04-21 19:09:46 -05:00
Cheah Chu Yeow
cf32baf915 Rescue from Timeout::Error in ActiveResource::Connection. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-22 09:30:56 +12:00
Cheah Chu Yeow
105910429d Introduce ActiveResource::Base.timeout. This allows a timeout to be set on the internal Net::HTTP instance ARes uses (default is 60 seconds). Setting a low timeout allows ARes clients to fail-fast in the event of a unresponsive/crashed server, rather than cause cascading failures in your application. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-22 09:30:41 +12:00
Cody Fauser
4809dcc1b5 * Remove default_url_options from mailer generator 
* Improve mailer documentation regarding generating URLs
* Add no_match to mailer generator to warn contributors about default_url_options
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-04-21 14:31:54 -05:00
Joshua Peek
4ac33de4d6 Add back empty plugin folders that were lost when we moved to git. 2008-04-21 13:48:44 -05:00
Joshua Peek
1d09ccd949 Revert "Update plugin loading tests to reflect changes in plugin fixtures." 
This reverts commit eef9002968.
 2008-04-21 13:27:19 -05:00
Joshua Peek
eef9002968 Update plugin loading tests to reflect changes in plugin fixtures. 2008-04-21 13:24:38 -05:00
Joshua Peek
1642b2362e Gem dependencies don't require a version. Also fixed up failing gem dependency tests. 2008-04-21 12:23:15 -05:00
Joshua Peek
1a29a67178 Mock RailsFCGIHandler and Dispatcher to stop mocha deprecation warnings. 2008-04-21 11:54:46 -05:00
Pratik Naik
6dbe90dd9b Alias Object#instance_variable_names to Object#instance_variables for Ruby 1.8.x 2008-04-21 12:03:01 +01:00
Pratik Naik
a04f022877 Delegate ivars to controller instead of copying 
Reduce number of instance variables being copied from controller to
view. Instead, delegate them to controller instance.
 2008-04-21 11:53:14 +01:00
gbuesing
f757f58388 select_datetime and select_time default to Time.zone.now when config.time_zone is set 2008-04-21 00:40:04 -05:00
gbuesing
c2c779044f datetime_select defaults to Time.zone.now when config.time_zone is set 2008-04-21 00:08:45 -05:00
Steven Soroka
f386676661 Use the rails user when creating and dropping the database rather than falling back to the currently logged in user who may or may not have CREATE / DROP privileges and no password. 
Closes #11564 (trac)
 2008-04-21 16:42:15 +12:00
gbuesing
6ef4239f8b Merge branch 'master' of git@github.com:rails/rails 2008-04-20 21:57:56 -05:00
gbuesing
32b82e4c6f Duration #since and #ago with no argument (e.g., 5.days.ago) return TimeWithZone when config.time_zone is set. Introducing Time.current, which returns Time.zone.now if config.time_zone is set, otherwise just returns Time.now 2008-04-20 21:57:04 -05:00
Jeremy Kemper
1d18651ea3 Ruby 1.8.7 compat: detect and alias non-superclass DateTime#to_s 2008-04-20 19:56:01 -07:00
Jeremy Kemper
0b21ac5118 Ruby 1.8.7 compat: override unordered Enumerable#group_by 2008-04-20 19:56:01 -07:00
Jeremy Kemper
549c81db4a Ruby 1.8.7 compat: String#start_with? and #end_with? 2008-04-20 19:56:01 -07:00
Pratik Naik
2b69840e5e Remove ActionController::Base#view_controller_internals 
Get rid of ActionController::Base#view_controller_internals flag and
use @@protected_view_variables for storing the list of controller
specific instance variables which should be inaccessible inside views.
 2008-04-21 03:45:38 +01:00
Pratik Naik
caa03a5c87 Remove ActionController::Base#add_class_variables_to_assigns 2008-04-21 02:43:48 +01:00
Jeremy Kemper
ef8d26653d Merge commit 'rails/master' 2008-04-20 16:50:41 -07:00