Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Properly require database tasks so we have access to the raised constant | Carlos Antonio da Silva | 2013-11-17 | 3 | -0/+3 |
| | | | | Fix travis failures. | ||||
* | Merge pull request #12928 from vipulnsward/drop_unused_param | Carlos Antonio da Silva | 2013-11-17 | 1 | -1/+1 |
|\ | | | | | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string` | ||||
| * | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string` | Vipul A M | 2013-11-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #12921 from kuldeepaggarwal/documentation-updation | Carlos Antonio da Silva | 2013-11-17 | 1 | -1/+1 |
|\ \ | |/ |/| | [ci skip]updated documentation: added sass and less extensions | ||||
| * | [ci skip]updated documentation: added sass and less extensions | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+1 |
|/ | |||||
* | rm minitest monkey patch | Aaron Patterson | 2013-11-16 | 1 | -17/+0 |
| | |||||
* | Merge pull request #12919 from arunagw/aa-build-fix-1.9.3 | Yves Senn | 2013-11-16 | 1 | -1/+1 |
|\ | | | | | Build fix for ruby 1.9.3 syntax | ||||
| * | Build fix for ruby 1.9.3 syntax | Arun Agrawal | 2013-11-16 | 1 | -1/+1 |
| | | |||||
* | | pass the pk to compile_update | Aaron Patterson | 2013-11-16 | 3 | -3/+6 |
|/ | |||||
* | Merge pull request #12918 from versioncontrol/rails-12866 | Rafael Mendonça França | 2013-11-16 | 3 | -1/+14 |
|\ | | | | | | | | | | | | | Checks to see if the record contains the foreign_key to set the inverse automatically Conflicts: activerecord/CHANGELOG.md | ||||
| * | Checks to see if the record contains the foreign_key to set the inverse ↵ | Edo Balvers | 2013-11-16 | 3 | -1/+14 |
| | | | | | | | | automatically | ||||
* | | Merge pull request #12859 from jetthoughts/track_initializers_loading | Rafael Mendonça França | 2013-11-16 | 4 | -1/+59 |
|\ \ | | | | | | | Track initializer's loaded event per file | ||||
| * | | Instrument each load config initializer | Paul Nikitochkin | 2013-11-16 | 4 | -1/+59 |
|/ / | | | | | | | | | | | In order to simplify profiling loading of initializers, added instument for tracking load config initializer event from `config/initializers` | ||||
* | | Merge pull request #12917 from akshay-vishnoi/refactor | Rafael Mendonça França | 2013-11-16 | 1 | -1/+1 |
|\ \ | | | | | | | avoiding iterations and calling of underscore on all elements of array | ||||
| * | | avoiding iterations and calling of underscore on all elements of array | Akshay Vishnoi | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12911 from zenspider/test_order_dependency_fixes | Aaron Patterson | 2013-11-16 | 2 | -14/+26 |
|\ \ \ | |/ / |/| | | Test order dependency fixes | ||||
| * | | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵ | Ryan Davis | 2013-11-16 | 1 | -6/+10 |
| | | | | | | | | | | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same | ||||
| * | | Fix bad test order dependency between ↵ | Ryan Davis | 2013-11-16 | 1 | -8/+16 |
| | | | | | | | | | | | | test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb | ||||
* | | | Merge pull request #12916 from petervandenabeele/typo_4_0_release_notes | Carlos Antonio da Silva | 2013-11-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [ci skip] typo in ArgumentError in 4_0_release_notes.md | ||||
| * | | | [ci skip] typo in ArgumentError exception | Peter Vandenabeele | 2013-11-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #12907 from JuanitoFatas/upgrading | Rafael Mendonça França | 2013-11-15 | 1 | -9/+10 |
|\ \ \ | | | | | | | | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words. | ||||
| * | | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words. | Juanito Fatas | 2013-11-16 | 1 | -9/+10 |
| | | | | |||||
* | | | | Merge pull request #12703 from makimoto/actionsupport-error-set_backtrace | Rafael Mendonça França | 2013-11-15 | 3 | -2/+13 |
|\ \ \ \ | | | | | | | | | | | Use set_backtrace instead of @backtrace in ActionView error | ||||
| * | | | | Use `set_backtrace` instead of `@backtrace` in ActionView error | Shimpei Makimoto | 2013-11-16 | 3 | -2/+13 |
| | | | | | |||||
* | | | | | Merge pull request #12904 from sbagdat/patch-1 | Rafael Mendonça França | 2013-11-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Change Relation#all to Relation#load [ci skip] | ||||
| * | | | | Change Relation#all to Relation#load [ci skip] | Sıtkı Bağdat | 2013-11-15 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | test should clean up after themselves | Aaron Patterson | 2013-11-15 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #12779 from ↵ | Aaron Patterson | 2013-11-15 | 4 | -10/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql Don't swallow exceptions in transctional statements | ||||
| * | | | Remove tests for not swallowing exceptions. | Doug Barth | 2013-11-15 | 2 | -42/+0 |
| | | | | | | | | | | | | | | | | From PR, @tenderlove would prefer to not maintain these tests. | ||||
| * | | | Don't swallow exceptions in transctional statements | Doug Barth | 2013-11-05 | 4 | -10/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MySQL connection adapater swallows all StandardError exceptions, which includes Mysql::Error and Mysql2::Error. The comment in the exception clause claims errors thrown here indicate that transactions aren't supported by the server but that isn't necessarily true. It's possible the MySQL server has gone away and swallowing a failed commit may let the application return a successful response when the data has not been saved. Also, replication libraries like Galera require that the application handle exceptions thrown at BEGIN/COMMIT. I'm unable to determine what version of MySQL threw an exception for transactional statements. I tried as far back as 3.23.49 with InnoDB disabled but BEGIN & COMMIT statements do not throw an error. If there's a real case for this logic to continue, we could instead push this behavior into a configuration setting. The exception swallowing has been there since the beginning: db045dbbf60b53dbe013ef25554fd013baf88134 | ||||
* | | | | Merge pull request #12531 from iamvery/database-tasks-exit-status | Rafael Mendonça França | 2013-11-15 | 6 | -16/+51 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly exit with status "1" for create and drop task failures Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | Explicitly exit with status "1" for create and drop failures | Jay Hayes | 2013-11-11 | 6 | -16/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A non-zero exit status allows subsequent shell commands to be chained together such as: `rake db:reset test:prepare && rspec && cap deploy` (if you're feeling brave :) * Any exceptions raised during the `create` and `drop` tasks are caught in order to print a "pretty" message to the user. Unfortunately doing so prevents rake from aborting with a non-zero exit status to the shell. * Therefore we re-raise the exceptions after the "pretty" message and re-catch them in the task. * From the task we explicitly exit with a non-zero status. This method was chosen (rather than just letting rake fail from the exception) so that the backtrace is suppressed and the output to stderr is unchanged. * Update activerecord CHANGELOG | ||||
* | | | | | Merge pull request #12853 from joshjordan/master | Rafael Mendonça França | 2013-11-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Allocate one less object using html_safe during content_tag construction | ||||
| * | | | | | Allocate one less object using html_safe during content_tag construction | Josh Jordan | 2013-11-14 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #10848 from 907th/add_block_to_cattr_reader | Rafael Mendonça França | 2013-11-15 | 4 | -0/+40 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix #10847: allow to pass a block to `cattr_reader`. | ||||
| * | | | | | | Unify `cattr_*` interface: allow to pass a block to `cattr_reader`. | Alexey Chernenkov | 2013-11-15 | 4 | -0/+40 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class A cattr_reader(:defr) { 'default_reader_value' } end A.defr # => 'default_reader_value' | ||||
* | | | | | | explain how `to_param` wil truncate long values. [ci skip] refs #12900. | Yves Senn | 2013-11-15 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #12900 from kuldeepaggarwal/f-to-param | Rafael Mendonça França | 2013-11-15 | 2 | -0/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | added one test case and example for ActiveRecord::Base.to_param method | ||||
| * | | | | | | added one test case and example for ActiveRecord::Base.to_param method | Kuldeep Aggarwal | 2013-11-15 | 2 | -0/+10 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_link | Rafael Mendonça França | 2013-11-15 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove broken Commmand Line guide link | ||||
| * | | | | | Remove broken Commmand Line guide link | Nate Berkopec | 2013-11-15 | 1 | -2/+0 |
|/ / / / / | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #12898 from chocoby/fix/changelog_comment | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix CHANGELOG typo [ci skip] | ||||
| * | | | | | Fix CHANGELOG typo [ci skip] | chocoby | 2013-11-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Avoid hash lookups for building an array of required defaults | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Only set the value once after it's calculated. | ||||
* | | | | | | Get rid of useless temp variable | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Set values instead of building hashes with single values for merging | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #9599 from ognevsky/hash-inside-array-in-url-for | Andrew White | 2013-11-15 | 4 | -0/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | Take Hash with options inside Array in #url_for | ||||
| * | | | | | Take Hash with options inside Array in #url_for | Andrey Ognevsky | 2013-11-15 | 4 | -0/+31 |
|/ / / / / | |||||
* / / / / | document id prefixed String usage of `.find`. refs #12891 [ci skip] | Yves Senn | 2013-11-15 | 1 | -5/+6 |
|/ / / / | |||||
* | | | | Remove short circuit return in favor of simple conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -4/+7 |
| | | | |