aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #18777 from yasyf/issue_15209Rafael Mendonça França2015-03-033-1/+24
|\ \ \ | | | | | | | | Take DST into account when locating TimeZone from Numeric
| * | | Take DST into account when locating TimeZone from Numeric.Yasyf Mohamedali2015-03-033-1/+24
| |/ / | | | | | | | | | | | | | | | When given a specific offset, use the first result found where the total current offset (including any periodic deviations such as DST) from UTC is equal.
* | | Tiny documentation edits [ci skip]Robin Dupret2015-03-032-2/+2
| | |
* | | Remove line wrapping from the benchmark/ips outputPiotr Szotkowski2015-03-031-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #18775 from yasyf/issue_5122Rafael Mendonça França2015-03-034-1/+25
|\ \ \ | |/ / |/| | | | | Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`
| * | Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`.Yasyf Mohamedali2015-02-244-1/+25
| | | | | | | | | | | | | | | | | | Fixed an issue where the `RAILS_RELATIVE_URL_ROOT` environment variable is not prepended to the path when `url_for` is called. If `SCRIPT_NAME` (used by Rack) is set, it takes precedence.
* | | Merge pull request #19176 from imajes/masterYves Senn2015-03-032-1/+17
|\ \ \ | | | | | | | | Fixes reference for schema_format to AR::Base from AS::Base
| * | | Fixes reference for schema_format to AR::Base from AS::BaseJames Cox2015-03-032-1/+17
| | | |
* | | | Remove mention of long-gone initializer and configJeremy Kemper2015-03-031-2/+0
| | | | | | | | | | | | | | | | | | | | Serving public files from multiple paths was removed in afc828828ffffe7edeb4648a9d2aa4731191ae21
* | | | Merge pull request #19186 from kamipo/remove_unused_lineCarlos Antonio da Silva2015-03-031-1/+0
|\ \ \ \ | | | | | | | | | | Remove unused line
| * | | | Remove unused lineRyuta Kamizono2015-03-031-1/+0
|/ / / /
* | | | Merge pull request #19171 from JuanitoFatas/doc/more-examplesSean Griffin2015-03-021-0/+16
|\ \ \ \ | | | | | | | | | | Add more documents for AR connection_adapters abstract schema_definitions. [ci skip]
| * | | | Add more documents for AR connection_adapters abstract schema_definitions. ↵Juanito Fatas2015-03-031-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] - Add example to column_exists? - Add example to index_exists? - Add document for foreign_key - Add document for foreign_key_exists?
* | | | | Merge pull request #19147 from gsamokovarov/work-around-ruby-10695Eileen M. Uchitelle2015-03-023-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Work around for upstream Ruby bug #10685
| * | | | | Work around for upstream Ruby bug #10685Genadi Samokovarov2015-03-013-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In f6e293ec54f02f83cdb37502bea117f66f87bcae we avoided a segfault in the tests, however I think we should try to avoid the crash, as it may happen in user code as well. Here is what I distiled the bug down to: ```ruby # Rails case - works on 2.0, 2.1; crashes on 2.2 require 'action_dispatch' ActionDispatch::Response.new(200, "Content-Type" => "text/xml") # General case - works on 2.0, 2.1; crashes on 2.2 def foo(optional = {}, default_argument: nil) end foo('quux' => 'bar') ```
* | | | | | Merge pull request #15806 from tgxworld/partition_routes_during_setupAaron Patterson2015-03-024-8/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | Partition routes during setup.
| * | | | | | Partition routes during setup.Guo Xiang Tan2015-02-264-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partitioning of all the routes is currently being done during the first request. Since there is no need to clear the cache for `partitioned_routes` when adding a new route. We can move the partitioning of the routes during setup time.
* | | | | | | Merge pull request #19181 from davydovanton/update-helper-docsZachary Scott2015-03-021-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Add documentation for Helpers#all_helpers_from_path
| * | | | | | | [ci skip] Add documentation for Helpers#all_helpers_from_pathAnton Davydov2015-03-031-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Revert "delete unused method"Carlos Antonio da Silva2015-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a38732c8e6ab76ea0db4e1a617a1fa84b53a9750. Since the mutation logic was reverted in 07278519bb6db5579171fea70bccdfee1306f1d4, we must bring the reader method back as well, since the implementation relies on it.
* | | | | | | Merge pull request #19177 from gregmolnar/fixturesRafael Mendonça França2015-03-022-6/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added testcase for #18742
| * | | | | | | test reset_pk_sequence with multi connectionGreg Molnar2015-03-011-1/+1
| | | | | | | |
| * | | | | | | Use the correct connection for reset_pk_sequenceMontana Low2015-03-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a fs.model_class.connection uses a different database than connection, connection.reset_pk_sequence will fail with an exception causing fixture load to rollback. This is reproducible for any ActiveRecord::Base class that calls establish_connection with a different database.
* | | | | | | | Revert "mutate the transaction object to reflect state"Aaron Patterson2015-03-023-37/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 393e65b4170608593ad82377a9eadc918e85698d and ec51c3fedd16b561d096dcc1a6705fdc02ab7666 We don't want the records to hold hard references to transactions because they point at records that have callbacks.
* | | | | | | | be optimistic about missing route keysAaron Patterson2015-03-021-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch makes errors slightly more expensive when someone is missing a route key, but in exchange it drops 4 allocations per `url_for` call. Since missing a route key is an error, optimizing for the non-error path seems like a good trade off
* | | | | | | | use arg size for parallel iterationAaron Patterson2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already know the length of the args, so we can use that length for parallel iteration and cut down on allocations for `url_for` calls.
* | | | | | | | ask the routes objects for its Rack env keyAaron Patterson2015-03-023-2/+4
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this centralizes the logic for determining the script name key and drops object allocations when calling `engine_script_name` (which is called on each `url_for`).
* | | | | | | Merge pull request #19174 from zoltankiss/remove_unneeded_commentRafael Mendonça França2015-03-021-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unneeded comment
| * | | | | | | Remove unneeded comment. [ci skip]Zoltan Kiss2015-03-021-1/+0
| | | | | | | |
* | | | | | | | delete unused methodAaron Patterson2015-03-021-4/+0
| | | | | | | |
* | | | | | | | mutate the transaction object to reflect stateAaron Patterson2015-03-021-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this lets us keep singleton instances of "state" values and precalculate return values of things like `finalized?` and `completed?`.
* | | | | | | | ask the txn for it's state, not a state objectAaron Patterson2015-03-023-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way we don't have to mutate a state object, we can just change the state of the txn
* | | | | | | | change if! to unlessAaron Patterson2015-03-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #19173 from robin850/rbx-buildRafael Mendonça França2015-03-0212-9/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the Rubinius build
| * | | | | | | Skip the failing tests on Rubinius for nowRobin Dupret2015-03-024-0/+9
| | | | | | | |
| * | | | | | | Wrap inline rescue with or-equal callsRobin Dupret2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, `rescue_from` doesn't work with strings on Rubinius because of rubinius/rubinius#3272.
| * | | | | | | Avoid Ruby versions check on RubiniusRobin Dupret2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius is still targeting compliance with Ruby 2.1.0 but we are pretty close to a green build so let's avoid this check for the moment.
| * | | | | | | Test against the mail gem's edgeRobin Dupret2015-03-022-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The edge version ships with a patch that uses composition over inheritance for the Mail::PartsList object (see mikel/mail#782). Let's test Action Mailer against it to prevent eventual regressions and experience it. Moreover, this branch makes the Action Mailer suite green against Rubinius.
| * | | | | | | Add the platform-specific skip helpers to ActiveModelRobin Dupret2015-03-021-0/+9
| | | | | | | |
| * | | | | | | Avoid accurate assertions on error messagesRobin Dupret2015-03-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there are disparities between the raised error messages on the different implementations, let's avoid being too accurate.
| * | | | | | | Avoid parallelizing Action Pack's tests on RubiniusRobin Dupret2015-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `ForkingExecutor` class seems to be pretty slow on Rubinius due to DRb (c.f. http://git.io/xIVg), let's avoid running tests with it on this platform. Also, the `parallelize_me!` call make the suite to output a bunch of errors due to rubinius/rubinius#2934 since there are thread-safety problems with autoloading.
* | | | | | | | Move Array#without from Grouping to Access concern and add dedicated test ↵David Heinemeier Hansson2015-03-023-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (relates to #19157)
* | | | | | | | tests, favor `drop_table` and `:if_exists` over raw SQL.Yves Senn2015-03-024-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've replaced most querues using DROP TABLE in our tests already. This patch replaces the last couple calls.
* | | | | | | | Merge pull request #19105 from amatsuda/array_takeSean Griffin2015-03-023-5/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Preserve Array#take(n) behaviour of HasManyAssociation
| * | | | | | | | Preserve Array#take(n) behaviour of HasManyAssociationAkira Matsuda2015-02-283-5/+18
| | | | | | | | |
* | | | | | | | | Merge pull request #19077 from robin850/unknown-attribute-errorSean Griffin2015-03-0211-24/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move `UnknownAttributeError` to a more sane namespace
| * | | | | | | | | Follow-up to #10776Robin Dupret2015-02-2611-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name `ActiveModel::AttributeAssignment::UnknownAttributeError` is too implementation specific so let's move the constant directly under the ActiveModel namespace. Also since this constant used to be under the ActiveRecord namespace, to make the upgrade path easier, let's avoid raising the former constant when we deal with this error on the Active Record side.
* | | | | | | | | | Remove not needed .tapArthur Neves2015-03-021-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #19172 from JuanitoFatas/doc/fix-typoRichard Schneeman2015-03-021-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix a typo for PostgreSQL text limit, GB instead of Gb.
| * | | | | | | | | | [ci skip] Fix a typo for PostgreSQL text limit, GB instead of Gb.Juanito Fatas2015-03-031-2/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |