Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #5882 from vijaydev/fix_generated_attribute_build | Santiago Pastorino | 2012-04-17 | 1 | -2/+4 | |
|\ \ \ \ | | | | | | | | | | | Fixing the build | |||||
| * | | | | the index option is always created if the type is one of references or ↵ | Vijay Dev | 2012-04-18 | 1 | -2/+4 | |
|/ / / / | | | | | | | | | | | | | belongs_to. Refactoring it to a simpler form and fixing the build | |||||
* | | / | let's not use `and` in place of `&&` | Vijay Dev | 2012-04-18 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-18 | 11 | -27/+63 | |
|\ \ \ | ||||||
| * | | | let's keep the slash in the return value instead of the path variable [ci skip] | Vijay Dev | 2012-04-18 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fix confusing example in ActiveModel::Errors | Thibaut Courouble | 2012-04-17 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Warn about do end syntax in redirect option | Oscar Del Ben | 2012-04-17 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Fix redirect with block example | Alexey Vakhov | 2012-04-17 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Fix example in flash middleware | Alexey Vakhov | 2012-04-17 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix typo where a table name in a join was singular. | Don Petersen | 2012-04-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fixed a typo in migrations | luke | 2012-04-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | fix ActiveModel::Validations::Callbacks doc | Jan Xie | 2012-04-15 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | fix bad format [ci skip] | Michael de Silva | 2012-04-14 | 1 | -7/+7 | |
| | | | | ||||||
| * | | | Improve example in initializer | Oscar Del Ben | 2012-04-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | SQL query formatting | Bertrand Chardon | 2012-04-13 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | Reformatted two SQL queries in Section 6) and 7) to avoid horizontal scrolling where possible. | |||||
| * | | | Fix comment in AD http response | Alexey Vakhov | 2012-04-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | response in integration test accessible without @ via attr_reader | |||||
| * | | | Fix HTML sanitizer allowed_css_properties comment | Alexey Vakhov | 2012-04-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Revert "Added documentation to explain what happens if you don't set any ↵ | Rodrigo Flores | 2012-04-12 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461. | |||||
| * | | | Added documentation to explain what happens if you don't set any values for ↵ | Rodrigo Flores | 2012-04-12 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | the dependent option on has_many | |||||
| * | | | Add documentation to detail passing of an object as the second | Michael de Silva | 2012-04-13 | 1 | -0/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter passed to the ActiveSupport::Notifications.subscribe method instead of a block Example code sample and output is provided as well. | |||||
| * | | | Fix further typos in ActiveSupport::Notifications | Michael de Silva | 2012-04-13 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Fix rdoc typo in ActiveSupport::Notifications | Michael de Silva | 2012-04-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix typo on the add_index. | kennyj | 2012-04-13 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload" | Aaron Patterson | 2012-04-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 86c640a1625aa3a8ec8728c2f1c640c9718fcb0b, reversing changes made to a0c2cfdc51e16fc39c1d3b1e78bdd257188fa04e. | |||||
* | | | | Merge pull request #5871 from rafaelfranca/patch-1 | José Valim | 2012-04-17 | 1 | -5/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove unused test code. | |||||
| * | | | | Remove unused test code. | Rafael Mendonça França | 2012-04-16 | 1 | -5/+0 | |
| | |/ / | |/| | | | | | | | | | | | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller. | |||||
* / | | | Fix test | Santiago Pastorino | 2012-04-16 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #5864 from vatrai/remove_ordered_hash_autoload | Aaron Patterson | 2012-04-16 | 1 | -1/+0 | |
|\ \ \ | |_|/ |/| | | remove autoload for OrderedHash, usages removed already | |||||
| * | | remove autoload for OrderedHash, usages removed already | Vishnu Atrai | 2012-04-16 | 1 | -1/+0 | |
|/ / | ||||||
* | | Merge pull request #5835 from asanghi/master | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19' | |||||
| * | | Hey, let's just make it easier for everyone and dump the unmaintained ↵ | Aditya Sanghi | 2012-04-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork. | |||||
* | | | Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.x | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #5863 from rosenfeld/explicit-log-level | Jeremy Kemper | 2012-04-16 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Make log_level explicit in production.rb template | |||||
| * | | | Make log_level explicit in production.rb template | Rodrigo Rosenfeld Rosas | 2012-04-16 | 1 | -2/+2 | |
|/ / / | | | | | | | | | | | | | | | | The 'production' environment name is currently checked for setting up the default log_level to 'info' but that won't work if the environment is copied to staging.rb, for instance. Better to have it explicitly set. | |||||
* | | | Merge pull request #5860 from arunagw/multi_json_upgrade_fix | Piotr Sarnacki | 2012-04-16 | 2 | -4/+4 | |
|\ \ \ | | | | | | | | | fixed broken build after multi_json upgrade | |||||
| * | | | fixed broken build after multi_json upgrade | Arun Agrawal | 2012-04-16 | 2 | -4/+4 | |
|/ / / | | | | | | | Multi_json also upgraded. | |||||
* | | | Merge pull request #5856 from arunagw/build_fix_master | Piotr Sarnacki | 2012-04-16 | 2 | -8/+6 | |
|\ \ \ | | | | | | | | | fix scaffold_generator_test.rb | |||||
| * | | | fix scaffold_generator_test.rb and model_generator_test.rb | Arun Agrawal | 2012-04-16 | 2 | -8/+6 | |
| | | | | | | | | | | | | | | | | Broken after this 6a054b0038bac288a1f6e45feb5470f4ee492081 | |||||
* | | | | Merge pull request #5858 from bsodmike/master | Vijay Dev | 2012-04-16 | 3 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Update Rails 3.2.3 release date in changelogs as March 30, 2012 | |||||
| * | | | Update Rails 3.2.3 release date in changelogs as March 30, 2012 | Michael de Silva | 2012-04-16 | 3 | -3/+3 | |
|/ / / | | | | | | | | | | | | | The release date details have been taken from http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/ | |||||
* | | | opening a connection will block if the pool is full | Aaron Patterson | 2012-04-15 | 2 | -20/+63 | |
| | | | ||||||
* | | | Require for time_with_zone should stay in core_ext/time_zones :bomb: | Piotr Sarnacki | 2012-04-15 | 1 | -0/+1 | |
| | | | ||||||
* | | | Add missing require in Active Support time zones (fixes #5854) | Piotr Sarnacki | 2012-04-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations` | |||||
* | | | Merge pull request #5262 from joshuap/references_index | Jeremy Kemper | 2012-04-14 | 8 | -6/+159 | |
|\ \ \ | | | | | | | | | Automatically create indexes for references/belongs_to statements in migrations. | |||||
| * | | | Automatically create indexes for references/belongs_to statements in migrations. | Joshua Wood | 2012-04-14 | 8 | -6/+159 | |
|/ / / | ||||||
* | | | Merge pull request #5846 from nashby/patch-1 | José Valim | 2012-04-14 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | remove extra new line from generated Gemfile | |||||
| * | | | remove extra new line from generated Gemfile | Vasiliy Ermolovich | 2012-04-14 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #5842 from oscardelben/refactoring_notify_observers | Santiago Pastorino | 2012-04-14 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Rename notify_observers argument *arg to *args to make it more clear | |||||
| * | | | Rename notify_observers argument *arg to *args to make it more clear | Oscar Del Ben | 2012-04-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | that the method accepts multiple arguments | |||||
* | | | | Merge pull request #5837 from yahonda/new_sequence_name_is_too_long | Jon Leighton | 2012-04-14 | 1 | -4/+4 | |
|\ \ \ \ | |_|/ / |/| | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix |