aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12924 from kuldeepaggarwal/f-specsYves Senn2013-11-181-1/+3
|\ | | | | added test cases to find notes in a file with .builder extension
| * added test cases to find notes in a file with .builder extensionKuldeep Aggarwal2013-11-171-1/+3
| |
* | Merge pull request #12931 from yahonda/add_oracle_ignoredYves Senn2013-11-181-1/+1
|\ \ | | | | | | Do not count query for all_constraints and all_tab_cols tested with Oracle
| * | Do not count query for all_constraints and all_tab_cols in OracleYasuo Honda2013-11-181-1/+1
|/ /
* | Merge pull request #12929 from yahonda/test_merging_where_relations_add_orderCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | | | | | | Address test_merging_where_relations failure by adding order
| * | Address test_merging_where_relations failure by adding `order("posts.id")`Yasuo Honda2013-11-181-1/+1
|/ /
* | Add description for db:create and db:drop test tasks in ARCarlos Antonio da Silva2013-11-171-2/+4
| | | | | | | | | | This will help identify these tasks exists, since they are easier to setup things for running all AR tests.
* | Properly require database tasks so we have access to the raised constantCarlos Antonio da Silva2013-11-173-0/+3
| | | | | | | | Fix travis failures.
* | Merge pull request #12928 from vipulnsward/drop_unused_paramCarlos Antonio da Silva2013-11-171-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 M2013-11-171-1/+1
| |/
* | Merge pull request #12921 from kuldeepaggarwal/documentation-updationCarlos Antonio da Silva2013-11-171-1/+1
|\ \ | |/ |/| [ci skip]updated documentation: added sass and less extensions
| * [ci skip]updated documentation: added sass and less extensionsKuldeep Aggarwal2013-11-171-1/+1
|/
* rm minitest monkey patchAaron Patterson2013-11-161-17/+0
|
* Merge pull request #12919 from arunagw/aa-build-fix-1.9.3Yves Senn2013-11-161-1/+1
|\ | | | | Build fix for ruby 1.9.3 syntax
| * Build fix for ruby 1.9.3 syntaxArun Agrawal2013-11-161-1/+1
| |
* | pass the pk to compile_updateAaron Patterson2013-11-163-3/+6
|/
* Merge pull request #12918 from versioncontrol/rails-12866Rafael Mendonça França2013-11-163-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 Balvers2013-11-163-1/+14
| | | | | | | | automatically
* | Merge pull request #12859 from jetthoughts/track_initializers_loadingRafael Mendonça França2013-11-164-1/+59
|\ \ | | | | | | Track initializer's loaded event per file
| * | Instrument each load config initializerPaul Nikitochkin2013-11-164-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/refactorRafael Mendonça França2013-11-161-1/+1
|\ \ | | | | | | avoiding iterations and calling of underscore on all elements of array
| * | avoiding iterations and calling of underscore on all elements of arrayAkshay Vishnoi2013-11-171-1/+1
| | |
* | | Merge pull request #12911 from zenspider/test_order_dependency_fixesAaron Patterson2013-11-162-14/+26
|\ \ \ | |/ / |/| | Test order dependency fixes
| * | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵Ryan Davis2013-11-161-6/+10
| | | | | | | | | | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same
| * | Fix bad test order dependency between ↵Ryan Davis2013-11-161-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_notesCarlos Antonio da Silva2013-11-161-1/+1
|\ \ \ | | | | | | | | [ci skip] typo in ArgumentError in 4_0_release_notes.md
| * | | [ci skip] typo in ArgumentError exceptionPeter Vandenabeele2013-11-161-1/+1
|/ / /
* | | Merge pull request #12907 from JuanitoFatas/upgradingRafael Mendonça França2013-11-151-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 Fatas2013-11-161-9/+10
| | | |
* | | | Merge pull request #12703 from makimoto/actionsupport-error-set_backtraceRafael Mendonça França2013-11-153-2/+13
|\ \ \ \ | | | | | | | | | | Use set_backtrace instead of @backtrace in ActionView error
| * | | | Use `set_backtrace` instead of `@backtrace` in ActionView errorShimpei Makimoto2013-11-163-2/+13
| | | | |
* | | | | Merge pull request #12904 from sbagdat/patch-1Rafael Mendonça França2013-11-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Change Relation#all to Relation#load [ci skip]
| * | | | Change Relation#all to Relation#load [ci skip]Sıtkı Bağdat2013-11-151-1/+1
| |/ / /
* / / / test should clean up after themselvesAaron Patterson2013-11-151-0/+3
|/ / /
* | | Merge pull request #12779 from ↵Aaron Patterson2013-11-154-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 Barth2013-11-152-42/+0
| | | | | | | | | | | | | | | | From PR, @tenderlove would prefer to not maintain these tests.
| * | | Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-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-statusRafael Mendonça França2013-11-156-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 failuresJay Hayes2013-11-116-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/masterRafael Mendonça França2013-11-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Allocate one less object using html_safe during content_tag construction
| * | | | | Allocate one less object using html_safe during content_tag constructionJosh Jordan2013-11-141-1/+1
| | | | | |
* | | | | | Merge pull request #10848 from 907th/add_block_to_cattr_readerRafael Mendonça França2013-11-154-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix #10847: allow to pass a block to `cattr_reader`.
| * | | | | | Unify `cattr_*` interface: allow to pass a block to `cattr_reader`.Alexey Chernenkov2013-11-154-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 Senn2013-11-151-0/+3
| | | | | |
* | | | | | Merge pull request #12900 from kuldeepaggarwal/f-to-paramRafael Mendonça França2013-11-152-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 methodKuldeep Aggarwal2013-11-152-0/+10
| |/ / / / /
* | | | | | Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_linkRafael Mendonça França2013-11-151-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove broken Commmand Line guide link
| * | | | | Remove broken Commmand Line guide linkNate Berkopec2013-11-151-2/+0
|/ / / / / | | | | | | | | | | [ci skip]
* | | | | Merge pull request #12898 from chocoby/fix/changelog_commentCarlos Antonio da Silva2013-11-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix CHANGELOG typo [ci skip]
| * | | | | Fix CHANGELOG typo [ci skip]chocoby2013-11-151-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 18:44:09 +0000