Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Duration #since and #ago with no argument (e.g., 5.days.ago) return ↵ | gbuesing | 2008-04-20 | 5 | -3/+76 | |
|/ / / / | | | | | | | | | | | | | 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 | |||||
* | | | | Merge commit 'rails/master' | Jeremy Kemper | 2008-04-20 | 2 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Avoid adding two DISTINCT statements to queries in sqlite 2. | Frederick Cheung | 2008-04-21 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix sqlite adapter to work with the quoted table names returned by later ↵ | Frederick Cheung | 2008-04-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | versions of sqlite3. | |||||
* | | | | | Use append_features instead of included to get the inclusion order right | Jeremy Kemper | 2008-04-20 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge commit 'rails/master' | Jeremy Kemper | 2008-04-20 | 72 | -762/+830 | |
|\ \ \ \ | ||||||
| * | | | | Use define_callbacks helper for ActiveRecord validations. | Joshua Peek | 2008-04-20 | 4 | -57/+25 | |
| | | | | | ||||||
| * | | | | Add conditional options to caches_page method [#25 state:resolved] | Paul Horsfall | 2008-04-19 | 3 | -3/+20 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Remove unused ignore_missing_templates option | Pratik Naik | 2008-04-19 | 2 | -5/+1 | |
| | | | | | ||||||
| * | | | | Introduce ActionView::TestCase for testing view helpers. | Joshua Peek | 2008-04-19 | 21 | -131/+190 | |
| | | | | | ||||||
| * | | | | Move missing template logic to ActionView | Pratik Naik | 2008-04-19 | 13 | -31/+25 | |
| | | | | | ||||||
| * | | | | Introduce ActionView::InlineTemplate class | Pratik Naik | 2008-04-19 | 7 | -18/+37 | |
| | | | | | ||||||
| * | | | | Add example for default_url_options[:host] to generated mailers. | Mislav Marohnić | 2008-04-18 | 2 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Merge branch 'master' of git@github.com:josh/rails | Joshua Peek | 2008-04-18 | 1 | -6/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Slight optimization to CallbackChain#union and delete. | Joshua Peek | 2008-04-18 | 1 | -6/+5 | |
| | | | | | | ||||||
| * | | | | | Changed mailer generator to not use instance variables. | Mislav Marohnić | 2008-04-18 | 2 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | | Cleanup generator tests by extracting repeated code into ↵ | Mislav Marohnić | 2008-04-18 | 6 | -364/+227 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | generator_test_helper. Add test for mailer generator. Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵ | Pratik Naik | 2008-04-18 | 5 | -89/+73 | |
| | | | | | | | | | | | | | | | | | | | | production environment. | |||||
| * | | | | Tidy up ActiveSupport::Callbacks::CallbackChain instance API. | Joshua Peek | 2008-04-17 | 6 | -16/+54 | |
| | |_|/ | |/| | | ||||||
| * | | | Fix migrations when migrating to a specified version number with a fresh ↵ | Ian White | 2008-04-17 | 2 | -3/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | database [#1 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | Support options passed to ActiveSupport::Cache :mem_cache_store [#14 ↵ | jweiss | 2008-04-17 | 2 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | Ignore debug logs and ensure ActiveResource's log is cleaned up. | Joshua Peek | 2008-04-16 | 2 | -1/+1 | |
| | | | | ||||||
| * | | | Stub out Dispatcher#log_failsafe_exception method to please the test gods. | Joshua Peek | 2008-04-15 | 1 | -3/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' of git://github.com/stephencelis/rails | Joshua Peek | 2008-04-14 | 4 | -11/+13 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | Scripts and styles with multiple dots in the filename should cache | Stephen Celis | 2008-04-12 | 4 | -11/+13 | |
| | | | ||||||
| * | | Added Rails.public_path to control where HTML and assets are expected to be ↵ | David Heinemeier Hansson | 2008-04-13 | 7 | -9/+35 | |
| | | | | | | | | | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-13 | 9 | -18/+107 | |
| |\ \ | ||||||
| | * | | Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller] | gbuesing | 2008-04-12 | 3 | -7/+63 | |
| | |/ | ||||||
| | * | Add #getutc alias for DateTime#utc | gbuesing | 2008-04-12 | 3 | -0/+4 | |
| | | | ||||||
| | * | Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through ↵ | gbuesing | 2008-04-12 | 2 | -9/+20 | |
| | | | | | | | | | | | | method_missing | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-12 | 10 | -27/+107 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of git://github.com/rails/rails | David Heinemeier Hansson | 2008-04-11 | 4 | -45/+19 | |
| |\ \ \ | ||||||
| * | | | | Testing commits | David Heinemeier Hansson | 2008-04-10 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | Incompatible Symbol#to_proc was reverted upstream | Jeremy Kemper | 2008-04-20 | 1 | -7/+0 | |
| | | | | | ||||||
* | | | | | Override incompatible 1.8.7p1 String#chars | Jeremy Kemper | 2008-04-19 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Feature check :force_encoding instead of RUBY_VERSION | Jeremy Kemper | 2008-04-19 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Override Ruby 1.8.7's incompatible Symbol#to_proc. | Jeremy Kemper | 2008-04-18 | 1 | -1/+8 | |
| |_|_|/ |/| | | | ||||||
* | | | | TimeWithZone respects config.active_support.use_standard_json_time_format | gbuesing | 2008-04-12 | 3 | -1/+14 | |
| | | | | ||||||
* | | | | rake time:zones:local finds correct base utc offset for zones in the ↵ | Geoffrey Buesing | 2008-04-12 | 2 | -1/+6 | |
| |_|/ |/| | | | | | | | | Southern Hemisphere | |||||
* | | | Merge branch 'master' into custom_paths_for_resource_names | Michael Koziarski | 2008-04-12 | 3 | -13/+17 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of git@github.com:rails/rails | Michael Koziarski | 2008-04-12 | 2 | -7/+8 | |
| |\ \ \ | ||||||
| | * | | | stub the instance method, there is no class method | Jeremy Kemper | 2008-04-11 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Ruby 1.9 compat: workaround module_eval issue | Jeremy Kemper | 2008-04-11 | 1 | -6/+7 | |
| | | | | | ||||||
| * | | | | Allow freezing to specific releases with rake rails:freeze:edge ↵ | Michael Koziarski | 2008-04-12 | 1 | -6/+9 | |
| |/ / / | | | | | | | | | | | | | RELEASE=1.2.0 per-release zip files are generated automatically by git-archive on dev.rubyonrails.org. | |||||
* / / / | Allow alternative values for the 'new' and 'edit' actions in resourceful routes. | Michael Koziarski | 2008-04-12 | 3 | -3/+28 | |
|/ / / | | | | | | | | | | | | | | | | map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' } Closes #11181. [ivanvr] | |||||
* | | | Now that we have gems:unpack and gems:build allowing for integration of | David Dollar | 2008-04-11 | 2 | -7/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Fixed that formatted_polymorphic_route should be able to take the :format as ↵ | David Heinemeier Hansson | 2008-04-11 | 2 | -4/+19 | |
| |/ |/| | | | | | part of a single hash or as the option hash (references #8741) | |||||
* | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-04-10 | 3 | -16/+0 | |
|\ \ | ||||||
| * | | Revert "Ensure that save on child object fails for invalid belongs_to ↵ | Michael Koziarski | 2008-04-11 | 3 | -16/+0 | |
| |/ | | | | | | | | | | | association. Closes #11555. [rubyruy]" This reverts commit c67e985994362290308073ed2793dd8e7f2a76db. | |||||
* / | rake rails:freeze:edge using ↵ | Jeremy Kemper | 2008-04-10 | 1 | -29/+19 | |
|/ | | | | http://dev.rubyonrails.org/archives/rails_edge.zip instead of Subversion |