Commit Graph

6762 Commits

Author SHA1 Message Date
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
Jeremy Kemper
59f5d4fc79 Use append_features instead of included to get the inclusion order right 2008-04-20 16:49:58 -07:00
Frederick Cheung
55622e0bde Avoid adding two DISTINCT statements to queries in sqlite 2. 2008-04-21 11:47:15 +12:00
Frederick Cheung
a2028a7d7b Fix sqlite adapter to work with the quoted table names returned by later versions of sqlite3. 2008-04-21 11:45:48 +12:00
Jeremy Kemper
3b93ca221d Merge commit 'rails/master' 2008-04-20 15:30:41 -07:00
Joshua Peek
46ab7422d9 Use define_callbacks helper for ActiveRecord validations. 2008-04-20 11:45:44 -05:00
Jeremy Kemper
daab53d8c0 Incompatible Symbol#to_proc was reverted upstream 2008-04-20 03:52:13 -07:00
Jeremy Kemper
f67b070fac Override incompatible 1.8.7p1 String#chars 2008-04-19 17:16:19 -07:00
Jeremy Kemper
715db1a797 Feature check :force_encoding instead of RUBY_VERSION 2008-04-19 17:15:50 -07:00
Paul Horsfall
14a40804a2 Add conditional options to caches_page method [#25 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-19 16:21:34 -05:00
Pratik Naik
3f8d3cd04f Remove unused ignore_missing_templates option 2008-04-19 19:26:56 +01:00
Joshua Peek
17d4164a16 Introduce ActionView::TestCase for testing view helpers. 2008-04-19 13:08:24 -05:00
Pratik Naik
ef4c65088f Move missing template logic to ActionView 2008-04-19 18:59:13 +01:00
Pratik Naik
534c6b2444 Introduce ActionView::InlineTemplate class 2008-04-19 16:21:18 +01:00
Mislav Marohnić
69a5c1df82 Add example for default_url_options[:host] to generated mailers.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-18 17:19:28 -05:00
Joshua Peek
29ea0f68aa Merge branch 'master' of git@github.com:josh/rails 2008-04-18 17:14:52 -05:00
Mislav Marohnić
36eecda8d0 Changed mailer generator to not use instance variables.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-18 17:13:15 -05:00
Mislav Marohnić
dfdb9f738e Cleanup generator tests by extracting repeated code into generator_test_helper. Add test for mailer generator.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-18 17:10:58 -05:00
Jeremy Kemper
db11ef9546 Override Ruby 1.8.7's incompatible Symbol#to_proc. 2008-04-18 14:50:20 -07:00
Joshua Peek
a4c15303cb Slight optimization to CallbackChain#union and delete. 2008-04-18 14:44:55 -05:00
Pratik Naik
986aec5dbb Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in production environment. 2008-04-18 13:05:43 +01:00
Joshua Peek
cf04e62127 Tidy up ActiveSupport::Callbacks::CallbackChain instance API. 2008-04-17 23:30:01 -05:00
Ian White
82b4faf812 Fix migrations when migrating to a specified version number with a fresh database [#1 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-17 13:43:47 -05:00
jweiss
9e1d506a8c Support options passed to ActiveSupport::Cache :mem_cache_store [#14 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-17 12:58:31 -05:00
Joshua Peek
9e53b63601 Ignore debug logs and ensure ActiveResource's log is cleaned up. 2008-04-16 13:17:03 -05:00
Joshua Peek
745359a494 Stub out Dispatcher#log_failsafe_exception method to please the test gods. 2008-04-15 18:04:12 -05:00
Joshua Peek
93641f30b7 Merge branch 'master' of git://github.com/stephencelis/rails 2008-04-14 15:01:47 -05:00
David Heinemeier Hansson
420c4b3d88 Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] 2008-04-13 17:33:27 -05:00
David Heinemeier Hansson
be7fd8168a Merge branch 'master' of git://github.com/rails/rails 2008-04-13 17:28:14 -05:00
gbuesing
9620372a6d Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller] 2008-04-12 19:35:47 -05:00
Stephen Celis
89237fe07e Scripts and styles with multiple dots in the filename should cache 2008-04-12 18:43:38 -05:00
gbuesing
f285b6119b Add #getutc alias for DateTime#utc 2008-04-12 17:37:50 -05:00
gbuesing
0289b0e7df Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through method_missing 2008-04-12 17:31:29 -05:00
gbuesing
7e5aa6569b TimeWithZone respects config.active_support.use_standard_json_time_format 2008-04-12 16:48:56 -05:00
Geoffrey Buesing
cfd56882af rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere 2008-04-12 16:06:29 -05:00
David Heinemeier Hansson
342dcfe789 Merge branch 'master' of git://github.com/rails/rails 2008-04-12 10:26:29 -05:00
Michael Koziarski
60be4b09f5 Merge branch 'master' into custom_paths_for_resource_names 2008-04-12 12:40:51 +12:00
Michael Koziarski
063c393bf0 Allow alternative values for the 'new' and 'edit' actions in resourceful routes.
map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' }

Closes #11181.  [ivanvr]
2008-04-12 12:40:40 +12:00
Michael Koziarski
35904e2079 Merge branch 'master' of git@github.com:rails/rails 2008-04-12 12:08:45 +12:00
Michael Koziarski
6ed9e68e21 Allow freezing to specific releases with rake rails:freeze:edge RELEASE=1.2.0 per-release zip files are generated automatically by git-archive on dev.rubyonrails.org. 2008-04-12 12:08:26 +12:00
Jeremy Kemper
9a7ab8b05b stub the instance method, there is no class method 2008-04-11 16:46:46 -07:00
Jeremy Kemper
13e7849785 Ruby 1.9 compat: workaround module_eval issue 2008-04-11 16:46:46 -07:00
David Dollar
4364c361b5 Now that we have gems:unpack and gems:build allowing for integration of
100% of your gems into vendor/ it would be nice to have the ability to
automatically unpack the full dependency tree of your specified gems.

This patch adds the rake task gems:unpack:dependencies to do this.

Usage:

gems:unpack:dependencies          # unpack all dependencies
gems:unpack:dependencies GEM=foo  # unpack all dependencies for gem foo
2008-04-11 18:25:11 -04:00
David Heinemeier Hansson
e89093aeb4 Fixed that formatted_polymorphic_route should be able to take the :format as part of a single hash or as the option hash (references #8741) 2008-04-11 12:34:44 -05:00
David Heinemeier Hansson
b8bc92e619 Merge branch 'master' of git://github.com/rails/rails 2008-04-11 08:41:02 -05:00
Jeremy Kemper
f46fd6f2fc Merge branch 'master' of git@github.com:rails/rails 2008-04-10 22:16:08 -07:00
Jeremy Kemper
4b17082107 rake rails:freeze:edge using http://dev.rubyonrails.org/archives/rails_edge.zip instead of Subversion 2008-04-10 22:15:50 -07:00
Michael Koziarski
2e74177d0b Revert "Ensure that save on child object fails for invalid belongs_to association. Closes #11555. [rubyruy]"
This reverts commit c67e985994.
2008-04-11 16:04:11 +12:00