| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | 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 | |||||
| | * | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | Yasuo Honda | 2012-04-13 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | extract deprecated code for #find, #first, #last, #all | Jon Leighton | 2012-04-13 | 1 | -105/+36 | |
| | | | | | | ||||||
| * | | | | | extract deprecated #calculate code | Jon Leighton | 2012-04-13 | 1 | -83/+25 | |
| | | | | | | ||||||
| * | | | | | move code out to active_record_deprecated_finders | Jon Leighton | 2012-04-13 | 1 | -7/+2 | |
| | | | | | | ||||||
| * | | | | | fix tests | Jon Leighton | 2012-04-13 | 7 | -81/+74 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5832 from kennyj/fix_5267 | Jon Leighton | 2012-04-13 | 2 | -3/+7 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method. | |||||
| | * | | | | | Fix wrong return value from reset_sequence_name method. | kennyj | 2012-04-14 | 2 | -3/+7 | |
| | | | | | | | ||||||
| * | | | | | | move some of the update_all implementation to active_record_deprecated_finders | Jon Leighton | 2012-04-13 | 1 | -27/+14 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5814 from lest/patch-4 | Piotr Sarnacki | 2012-04-13 | 1 | -12/+13 | |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | don't duplicate default values in text helper | |||||
| | * | | | | | don't duplicate default values in text helper | Sergey Nartimov | 2012-04-11 | 1 | -12/+13 | |
| | | | | | | | ||||||
| * | | | | | | now we can just manipulate the values hash in #only and #except | Jon Leighton | 2012-04-13 | 4 | -36/+26 | |
| | | | | | | | ||||||
| * | | | | | | use a hash to store relation values | Jon Leighton | 2012-04-13 | 5 | -52/+74 | |
| | |/ / / / |/| | | | | ||||||
| * | | | | | Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-code | Jon Leighton | 2012-04-13 | 1 | -3/+0 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove obsolete code | |||||
| | * | | | | | Remove obsolete code | Alexey Vakhov | 2012-04-12 | 1 | -3/+0 | |
| | | | | | | | ||||||
| * | | | | | | doesn't make sense for select! to take a block | Jon Leighton | 2012-04-13 | 1 | -8/+3 | |
| | | | | | | | ||||||
| * | | | | | | remove apply_finder_options call from AssociationScope | Jon Leighton | 2012-04-13 | 4 | -9/+15 | |
| | | | | | | | ||||||
| * | | | | | | Make Relation#extending work like other value methods | Jon Leighton | 2012-04-13 | 5 | -27/+22 | |
| | | | | | | | ||||||
| * | | | | | | Add Relation#merge! | Jon Leighton | 2012-04-13 | 2 | -9/+17 | |
| | | | | | | | ||||||
| * | | | | | | assert valid keys | Jon Leighton | 2012-04-13 | 3 | -0/+11 | |
| | | | | | | | ||||||
| * | | | | | | Allow Relation#merge to take a hash | Jon Leighton | 2012-04-13 | 4 | -49/+95 | |
| | | | | | | | ||||||
| * | | | | | | we have no need for the ASSOCIATION_METHODS constant | Jon Leighton | 2012-04-13 | 4 | -15/+11 | |
| | | | | | | | ||||||
| * | | | | | | we don't need to test that constant assignment works | Jon Leighton | 2012-04-13 | 1 | -15/+0 | |
| | | | | | | | ||||||
| * | | | | | | refactoring | Jon Leighton | 2012-04-13 | 1 | -36/+45 | |
| | | | | | | | ||||||
| * | | | | | | Extract clusterfuck method for surgery | Jon Leighton | 2012-04-13 | 2 | -71/+92 | |
| | |_|/ / / |/| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |