aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Jeremy Kemper2008-04-202-2/+2
|\
| * Avoid adding two DISTINCT statements to queries in sqlite 2.Frederick Cheung2008-04-211-1/+1
| * Fix sqlite adapter to work with the quoted table names returned by later vers...Frederick Cheung2008-04-211-1/+1
* | Use append_features instead of included to get the inclusion order rightJeremy Kemper2008-04-201-1/+2
|/
* Merge commit 'rails/master'Jeremy Kemper2008-04-2072-762/+830
|\
| * Use define_callbacks helper for ActiveRecord validations.Joshua Peek2008-04-204-57/+25
| * Add conditional options to caches_page method [#25 state:resolved]Paul Horsfall2008-04-193-3/+20
| * Remove unused ignore_missing_templates optionPratik Naik2008-04-192-5/+1
| * Introduce ActionView::TestCase for testing view helpers.Joshua Peek2008-04-1921-131/+190
| * Move missing template logic to ActionViewPratik Naik2008-04-1913-31/+25
| * Introduce ActionView::InlineTemplate classPratik Naik2008-04-197-18/+37
| * Add example for default_url_options[:host] to generated mailers.Mislav Marohnić2008-04-182-2/+9
| * Merge branch 'master' of git@github.com:josh/railsJoshua Peek2008-04-181-6/+5
| |\
| | * Slight optimization to CallbackChain#union and delete.Joshua Peek2008-04-181-6/+5
| * | Changed mailer generator to not use instance variables.Mislav Marohnić2008-04-182-12/+12
| * | Cleanup generator tests by extracting repeated code into generator_test_helpe...Mislav Marohnić2008-04-186-364/+227
| |/
| * Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in pr...Pratik Naik2008-04-185-89/+73
| * Tidy up ActiveSupport::Callbacks::CallbackChain instance API.Joshua Peek2008-04-176-16/+54
| * Fix migrations when migrating to a specified version number with a fresh data...Ian White2008-04-172-3/+12
| * Support options passed to ActiveSupport::Cache :mem_cache_store [#14 state:re...jweiss2008-04-172-1/+15
| * Ignore debug logs and ensure ActiveResource's log is cleaned up.Joshua Peek2008-04-162-1/+1
| * Stub out Dispatcher#log_failsafe_exception method to please the test gods.Joshua Peek2008-04-151-3/+6
| * Merge branch 'master' of git://github.com/stephencelis/railsJoshua Peek2008-04-144-11/+13
| |\
| | * Scripts and styles with multiple dots in the filename should cacheStephen Celis2008-04-124-11/+13
| * | Added Rails.public_path to control where HTML and assets are expected to be l...David Heinemeier Hansson2008-04-137-9/+35
| * | Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-139-18/+107
| |\ \
| | * | Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller]gbuesing2008-04-123-7/+63
| | |/
| | * Add #getutc alias for DateTime#utcgbuesing2008-04-123-0/+4
| | * Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through meth...gbuesing2008-04-122-9/+20
| * | Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-1210-27/+107
| |\ \
| * \ \ Merge branch 'master' of git://github.com/rails/railsDavid Heinemeier Hansson2008-04-114-45/+19
| |\ \ \
| * | | | Testing commitsDavid Heinemeier Hansson2008-04-101-2/+1
* | | | | Incompatible Symbol#to_proc was reverted upstreamJeremy Kemper2008-04-201-7/+0
* | | | | Override incompatible 1.8.7p1 String#charsJeremy Kemper2008-04-191-0/+6
* | | | | Feature check :force_encoding instead of RUBY_VERSIONJeremy Kemper2008-04-192-2/+2
* | | | | Override Ruby 1.8.7's incompatible Symbol#to_proc.Jeremy Kemper2008-04-181-1/+8
| |_|_|/ |/| | |
* | | | TimeWithZone respects config.active_support.use_standard_json_time_formatgbuesing2008-04-123-1/+14
* | | | rake time:zones:local finds correct base utc offset for zones in the Southern...Geoffrey Buesing2008-04-122-1/+6
| |_|/ |/| |
* | | Merge branch 'master' into custom_paths_for_resource_namesMichael Koziarski2008-04-123-13/+17
|\ \ \
| * \ \ Merge branch 'master' of git@github.com:rails/railsMichael Koziarski2008-04-122-7/+8
| |\ \ \
| | * | | stub the instance method, there is no class methodJeremy Kemper2008-04-111-1/+1
| | * | | Ruby 1.9 compat: workaround module_eval issueJeremy Kemper2008-04-111-6/+7
| * | | | Allow freezing to specific releases with rake rails:freeze:edge RELEASE=1.2.0...Michael Koziarski2008-04-121-6/+9
| |/ / /
* / / / Allow alternative values for the 'new' and 'edit' actions in resourceful routes.Michael Koziarski2008-04-123-3/+28
|/ / /
* | | Now that we have gems:unpack and gems:build allowing for integration ofDavid Dollar2008-04-112-7/+43
* | | Fixed that formatted_polymorphic_route should be able to take the :format as ...David Heinemeier Hansson2008-04-112-4/+19
| |/ |/|
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-04-103-16/+0
|\ \
| * | Revert "Ensure that save on child object fails for invalid belongs_to associa...Michael Koziarski2008-04-113-16/+0
| |/
* / rake rails:freeze:edge using http://dev.rubyonrails.org/archives/rails_edge.z...Jeremy Kemper2008-04-101-29/+19
|/
* Change validates_uniqueness_of :case_sensitive option default back to true (f...Rick Olson2008-04-102-2/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:14:18 +0000