aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Fix rake/notes_testschneems2015-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presumably due to https://github.com/rails/sprockets-rails/pull/265 sprockets was trying to load the "scss" gem but it isn't in the gemfile: ``` ApplicationTests::RakeTests::RakeNotesTest#test_register_a_new_extension: LoadError: cannot load such file -- sass ``` If we use an empty precompile list, it won't try to load sass.
| * | | | | | Fix reported regression rails/sprockets-rails#265schneems2015-07-291-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | We can prevent the UglifierCompressor from being instantiated prematurely by setting precompile to an empty array in this test.
* | | | | | Merge pull request #21056 from yui-knk/fix/deprecation_silenceRafael Mendonça França2015-07-291-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make silence a warning inserted by commit #4b3f8ac
| * | | | | | Make silence a warning inserted by commit #4b3f8acyui-knk2015-07-301-1/+4
| | | | | | |
* | | | | | | Merge pull request #21054 from yui-knk/fix/doc_field_error_procClaudio B.2015-07-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] `field_error_proc` is used in `ActionView::Helpers::ActiveM…
| * | | | | | [ci skip] `field_error_proc` is used in ↵yui-knk2015-07-291-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionView::Helpers::ActiveModelInstanceTag` so replace `Active Record` with `Active Model`
* | | | | | Merge pull request #21049 from y-yagi/fix_i18n_validation_testCarlos Antonio da Silva2015-07-281-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | pass the correct argument to mock on a test of `validates_length_of`
| * | | | | pass the correct argument to mock on a test of `validates_length_of`yuuji.yaginuma2015-07-281-1/+1
|/ / / / /
* | | | | Tiny documentation edits [ci skip]Robin Dupret2015-07-283-6/+8
| | | | |
* | | | | Merge pull request #21048 from yui-knk/fix/guide_about_action_pack2Yves Senn2015-07-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Add a link to action_controller_overview.html
| * | | | | [ci skip] Add a link to action_controller_overview.htmlyui-knk2015-07-281-1/+1
|/ / / / /
* | | | | Merge pull request #21047 from yui-knk/fix/guide_about_action_packRobin Dupret2015-07-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Now Action View is completely separated from Action Pack
| * | | | | [ci skip] Now Action View is completely separated from Action Packyui-knk2015-07-281-1/+1
|/ / / / /
* | | | | Add `:nodoc:` for internal testing methods [ci skip]Robin Dupret2015-07-285-9/+9
| | | | |
* | | | | Merge pull request #20590 from vngrs/set_default_charsetRafael Mendonça França2015-07-272-6/+13
|\ \ \ \ \ | | | | | | | | | | | | Document, refactor and create test case for ActionDispatch::Response
| * | | | | Document, refactor and create test case for ↵Mehmet Emin İNAÇ2015-06-172-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Response#charset= method
* | | | | | Merge pull request #20849 from vngrs/misleading_nested_exceptionsRafael Mendonça França2015-07-275-8/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix misleading errors for has_one through relations
| * | | | | | Fix misleading errors for has_one through relationsMehmet Emin İNAÇ2015-07-225-8/+36
| | | | | | |
* | | | | | | Merge pull request #20759 from vngrs/fix_wrong_docRafael Mendonça França2015-07-271-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change wrong usage in documentation about autoload_paths [ci skip]
| * | | | | | | Change wrong usage in documentation about autoload_paths [ci skip]Mehmet Emin İNAÇ2015-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use this configuration outside of the application.rb
* | | | | | | | Merge pull request #21031 from vngrs/fix_params_wrapper_docRafael Mendonça França2015-07-271-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix params_wrapper doc [ci skip]
| * | | | | | | | Fix params_wrapper doc [ci skip]Mehmet Emin İNAÇ2015-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature also works with `PUT`, `PATCH` and `DELETE` requests. Also developers can add `:url_encoded_form` and `:multipart_form` into the `:format` for wrapping url encoded or multipart form data.
* | | | | | | | | Merge pull request #20904 from kaspth/wildcard-template-dependenciesKasper Timm Hansen2015-07-279-12/+121
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add wildcard template dependencies.
| * | | | | | | | | Add wildcard template dependencies.Kasper Timm Hansen2015-07-269-12/+121
| | | | | | | | | |
* | | | | | | | | | Merge pull request #21040 from aditya-kapoor/fix-typoArthur Nogueira Neves2015-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] it should be protect_from_forgery
| * | | | | | | | | | [ci skip] it should be protect_from_forgeryAditya Kapoor2015-07-271-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #21003 from robin850/api-pluginsRafael Mendonça França2015-07-275-9/+84
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow generating plugins for API applications
| * | | | | | | | | | | Enable the `api_only` option for API plugins' generatorsRobin Dupret2015-07-232-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, running a generator inside the plugin's directory, files that are not relevant won't be generated (e.g. views or assets). This won't interfere with the application's generators configuration.
| * | | | | | | | | | | Generate an API dummy application for API pluginsRobin Dupret2015-07-232-0/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Make ApplicationController inherit from AC::API for API pluginsRobin Dupret2015-07-232-1/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Skip assets, helpers and views generation for API pluginsRobin Dupret2015-07-232-8/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Add the `--api` option for the plugin generatorRobin Dupret2015-07-232-0/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #21035 from radar/ryan-bigg-has-changed-jobsGodfrey Chan2015-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Ryan Bigg has changed jobs
| * | | | | | | | | | | | Ryan Bigg has changed jobs.Ryan Bigg2015-07-271-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #21030 from yahonda/mysql2_20969Kasper Timm Hansen2015-07-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | Remove @connection instance variable only when defined
| * | | | | | | | | | | | Remove @connection instance variable only when definedYasuo Honda2015-07-261-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Properly allow uniqueness validations on primary keys.Sean Griffin2015-07-253-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternate implementation of #20966. [Sean Griffin & presskey]
* | | | | | | | | | | | Merge pull request #21007 from clayton-shopify/fix-mailto-encodingRafael Mendonça França2015-07-242-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Encode the email address as prescribed in RFC 6068 section 2.
| * | | | | | | | | | | | Encode the email address as prescribed in RFC 6068 section 2.Clayton Smith2015-07-232-1/+9
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | `destroy` shouldn't raise when child associations fail to saveSean Griffin2015-07-244-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deep down in the association internals, we're calling `destroy!` rather than `destroy` when handling things like `dependent` or autosave association callbacks. Unfortunately, due to the structure of the code (e.g. it uses callbacks for everything), it's nearly impossible to pass whether to call `destroy` or `destroy!` down to where we actually need it. As such, we have to do some legwork to handle this. Since the callbacks are what actually raise the exception, we need to rescue it in `ActiveRecord::Callbacks`, rather than `ActiveRecord::Persistence` where it matters. (As an aside, if this code wasn't so callback heavy, it would handling this would likely be as simple as changing `destroy` to call `destroy!` instead of the other way around). Since we don't want to lose the exception when `destroy!` is called (in particular, we don't want the value of the `record` field to change to the parent class), we have to do some additional legwork to hold onto it where we can use it. Again, all of this is ugly and there is definitely a better way to do this. However, barring a much more significant re-architecting for what I consider to be a reletively minor improvement, I'm willing to take this small hit to the flow of this code (begrudgingly).
* | | | | | | | | | | | Merge pull request #20256 from ↵Sean Griffin2015-07-241-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arunagw/aa-remove-unused-rule-and-task-activerecord Remove unused rule and task from activerecord
| * | | | | | | | | | | | Remove unused rule and task from activerecordArun Agrawal2015-05-221-9/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #20928 from matthewd/unload-interlockMatthew Draper2015-07-245-35/+385
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | We need stricter locking before we can unload
| * | | | | | | | | | | | Small tweaks to mainly lock-ordering tests.thedarkone2015-07-221-21/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * only test the upgrade path, * add test to verify non upgrades can’t preempt, * add reentrancy assertion.
| * | | | | | | | | | | | Handle thread death during lock acquisitionMatthew Draper2015-07-212-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, clean up if the thread is killed while it's blocked awaiting the lock... if we get killed on some other arbitrary line, the result remains quite undefined.
| * | | | | | | | | | | | Adjust expectations around purpose/compatibility optionsMatthew Draper2015-07-212-9/+36
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add some meta-assertions for the custom assertionsMatthew Draper2015-07-211-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I accidentally discovered `assert_threads_not_stuck` couldn't fail, so the simplest solution was to prove they're all now working in both directions.
| * | | | | | | | | | | | Order of execution is only guaranteed if upgradingMatthew Draper2015-07-212-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the thread isn't yet holding any form of lock, it has no claim over what may / may not run while it's blocked.
| * | | | | | | | | | | | Fix ShareLock issues.thedarkone2015-07-201-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Tests for AS::Concurrency::ShareLock.thedarkone2015-07-201-0/+194
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 12:32:53 +0000