Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #4803 from lucascaton/master" | Santiago Pastorino | 2013-02-20 | 3 | -5/+3 |
| | | | | | | | | | | | | | | | This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
* | Skip failing test and add a FIXME note | Rafael Mendonça França | 2013-02-20 | 1 | -0/+2 |
| | |||||
* | Merge pull request #9344 from senny/changelog_cleanup | Rafael Mendonça França | 2013-02-20 | 1 | -4/+4 |
|\ | | | | | unify AR changelog entries [ci skip] | ||||
| * | unify AR changelog entries [ci skip] | Yves Senn | 2013-02-20 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #8645 from senny/rename_index_on_rename_column | Rafael Mendonça França | 2013-02-20 | 7 | -8/+73 |
|\ | | | | | also rename indexes when a table or column is renamed | ||||
| * | also rename indexes when a table or column is renamed | Yves Senn | 2013-02-20 | 7 | -8/+73 |
|/ | | | | When a table or a column is renamed related indexes kept their name. This will lead to confusing names. This patch renames related indexes when a column or a table is renamed. Only indexes with names generated by rails will be renamed. Indexes with custom names will not be renamed. | ||||
* | moves the new :nsec date format to the Active Support changelog [ci skip] | Xavier Noria | 2013-02-20 | 2 | -6/+5 |
| | |||||
* | revises the documentation of AR::Base.cache_timestamp_format [ci skip] | Xavier Noria | 2013-02-20 | 1 | -2/+4 |
| | |||||
* | Merge pull request #8613 from senny/8264_character_limit_for_indices | Rafael Mendonça França | 2013-02-20 | 6 | -14/+69 |
|\ | | | | | deal with long index names and internal sqlite3 operations | ||||
| * | reserve less chars for internal sqlite3 operations | Yves Senn | 2013-02-20 | 1 | -7/+7 |
| | | |||||
| * | reserve index name chars for internal rails operations | Yves Senn | 2013-02-20 | 6 | -9/+64 |
|/ | | | | | | | | | | | Some adapter (SQLite3) need to perform renaming operations to support the rails DDL. These rename prefixes operate with prefixes. When an index name already uses up the full space provieded by `index_name_length` these internal operations will fail. This patch introduces `allowed_index_name_length` which respects the amount of characters used for internal operations. It will always be <= `index_name_length` and every adapter can define how many characters need to be reserved. | ||||
* | Merge pull request #9332 from ↵ | Rafael Mendonça França | 2013-02-20 | 3 | -15/+45 |
|\ | | | | | | | | | wangjohn/adding_documentation_to_error_raising_in_query_methods Tests to make sure empty arguments in WhereChain raise errors | ||||
| * | Added comments about the check_empty_arguments method which is called | wangjohn | 2013-02-20 | 3 | -15/+45 |
| | | | | | | | | | | for query methods in a where_clause. Also, modified the CHANGELOG entry because it had false information and added tests. | ||||
* | | Merge pull request #9342 from hone/db_migrate_with_database_url | Rafael Mendonça França | 2013-02-20 | 1 | -1/+1 |
|\ \ | | | | | | | Fix ActiveRecord::ConnectionAdapters::ConnectionSpecification::ResolverTest | ||||
| * | | make type_cast_value a class level method | Terence Lee | 2013-02-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #9068 from wangjohn/transaction_callback_patch | Rafael Mendonça França | 2013-02-20 | 6 | -6/+89 |
|\ \ | | | | | | | Reduced memory leak problem in transactions by lazily updating AR objects | ||||
| * | | Reduced memory leak problem in transactions by lazily updating AR objects ↵ | wangjohn | 2013-02-20 | 6 | -6/+89 |
| |/ | | | | | | | with new transaction state. If AR object has a callback, the callback will be performed immediately (non-lazily) so the transaction still has to keep records with callbacks. | ||||
* | | Merge pull request #9341 from senny/move_precompiled_asset_config_to_application | Rafael Mendonça França | 2013-02-20 | 3 | -6/+10 |
|\ \ | |/ |/| | move config.assets.precompile into config/application.rb | ||||
| * | move config.assets.precompile into config/application.rb | Yves Senn | 2013-02-20 | 3 | -6/+10 |
| | | |||||
* | | Merge pull request #9120 from hone/db_migrate_with_database_url | Rafael Mendonça França | 2013-02-20 | 5 | -10/+24 |
|\ \ | |/ |/| | fix rake db:migrate when used with ENV['DATABASE_URL'] | ||||
| * | update changelog | Terence Lee | 2013-02-21 | 1 | -0/+3 |
| | | |||||
| * | run the load_structure test in the test environment | Terence Lee | 2013-02-21 | 1 | -3/+10 |
| | | |||||
| * | test DATABASE_URL without database.yml around | Terence Lee | 2013-02-21 | 1 | -0/+2 |
| | | |||||
| * | standardize database_configuration to a hash | Terence Lee | 2013-02-21 | 3 | -7/+9 |
|/ | | | | | | | make connection_url_to_hash a class method This als prevents loading database.yml if it doesn't exist but DATABASE_URL does | ||||
* | Merge pull request #9328 from sikachu/ps-remove-xml-parser | Guillermo Iguaran | 2013-02-20 | 5 | -342/+31 |
|\ | | | | | Remove XML Parser from ActionDispatch | ||||
| * | Remove XML Parser from ActionDispatch | Prem Sichanugrist | 2013-02-20 | 5 | -342/+31 |
|/ | | | | | If you want an ability to parse XML parameters, please install `actionpack-xml_parser` gem. | ||||
* | Whitespace :heart: and hash syntax change | Rafael Mendonça França | 2013-02-20 | 1 | -23/+22 |
| | |||||
* | Merge pull request #8060 from ↵ | Xavier Noria | 2013-02-20 | 3 | -3/+20 |
|\ | | | | | | | | | senny/7313_descriptive_error_message_for_missing_adapter descriptive error message when AR adapter was not found. Closes #7313 | ||||
| * | descriptive error message when AR adapter was not found. Closes #7313. | Yves Senn | 2013-02-20 | 3 | -3/+20 |
|/ | |||||
* | Merge pull request #9330 from bdmac/time_zone_select_dup | Andrew White | 2013-02-19 | 3 | -1/+16 |
|\ | | | | | Fix time_zone_options_for_select to not mutate TimeZones array | ||||
| * | Fix time_zone_options_for_select to not mutate TimeZones array | Brian McManus | 2013-02-19 | 3 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | Previous implementation of time_zone_options_for_select did not dup the ActiveSupport::TimeZone.all array. When :priority_zones were provided the method would reject! the zones from the memoized TimeZones array thus affecting future requests to the server. Essentially whatever zones were specified as :priority_zones would show up for the first request but then disappear from the time zone options on future requests. | ||||
* | | Merge pull request #9331 from robertomiranda/upgrading-guide | Guillermo Iguaran | 2013-02-19 | 1 | -0/+10 |
|\ \ | |/ |/| | Improve upgrading guide with ActionDispatch::BestStandardsSupport remova... | ||||
| * | Improve upgrading guide with ActionDispatch::BestStandardsSupport removal | robertomiranda | 2013-02-19 | 1 | -0/+10 |
|/ | |||||
* | Better not use tab chars in the generator template | Akira Matsuda | 2013-02-20 | 1 | -5/+5 |
| | |||||
* | Merge pull request #9324 from acapilleri/add_on_empty | Steve Klabnik | 2013-02-19 | 1 | -0/+7 |
|\ | | | | | added more accurate test for add_on_empty | ||||
| * | added more accurate test for add_on_empty | Angelo capilleri | 2013-02-19 | 1 | -0/+7 |
| | | | | | | | | | | with the current tests, if delete the assignment of is_empty in add_on_empty method the tests not fail. With this test, if we delete is_empty, the test fails | ||||
* | | s/revertible/reversible/ | Xavier Noria | 2013-02-19 | 1 | -1/+1 |
| | | |||||
* | | fixes a typo in the migrations guide | Xavier Noria | 2013-02-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9315 from ↵ | Steve Klabnik | 2013-02-19 | 1 | -23/+0 |
|\ \ | |/ |/| | | | | | Takehiro-Adachi/remove-unecessary-tests-from-ar-base_testrb delete duplicated tests in AR base_test.rb | ||||
| * | delete duplicated tests in AR base_test.rb | Takehiro Adachi | 2013-02-19 | 1 | -23/+0 |
| | | | | | | | | These are duplicated with the tests which are in relations_test.rb | ||||
* | | moves a CHANGELOG entry from AR to AP | Xavier Noria | 2013-02-19 | 2 | -4/+4 |
| | | |||||
* | | small tweaks in the AR CHANGELOG | Xavier Noria | 2013-02-19 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #9258 from wangjohn/blank_argument_errors_in_arel | Rafael Mendonça França | 2013-02-19 | 2 | -9/+34 |
|\ \ | | | | | | | Raising an error when query methods have blank arguments. | ||||
| * | | Raise an error when query methods have blank arguments, and when blank ↵ | John J Wang | 2013-02-19 | 2 | -9/+34 |
|/ / | | | | | | | arguments are meaningless. | ||||
* | | InvalidMessage is in ActiveSupport::MessageEncryptor namespace | Santiago Pastorino | 2013-02-19 | 2 | -4/+19 |
| | | | | | | | | Closes #9302 | ||||
* | | Fix rake routes output in railties test | Carlos Antonio da Silva | 2013-02-19 | 1 | -2/+4 |
| | | |||||
* | | Fix AP tests related to routes inspector output and the new column titles | Carlos Antonio da Silva | 2013-02-19 | 1 | -20/+65 |
| | | |||||
* | | Add missing require to routes inspector | Carlos Antonio da Silva | 2013-02-19 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #9321 from mfilej/action-dispatch-http-url-requires | Xavier Noria | 2013-02-19 | 1 | -0/+3 |
|\ \ | | | | | | | Require ActiveSupport dependencies in ActionDispatch::Http::URL | ||||
| * | | Require AS deps in ActionDispatch::Http::URL | Miha Filej | 2013-02-19 | 1 | -0/+3 |
| | | | | | | | | | | | | Allows us to use url_for and friends in isolation. |