aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27212 from dcarral/docs-action-on-unpermitted-parameters ↵Sean Griffin2016-11-291-2/+2
|\ | | | | | | | | [ci skip] Explicitly document 'false' as value for 'action_on_unpermitted_parameters'
| * Document 'false' as option for 'action_on_unpermitted_parameters'Daniel Carral2016-11-291-2/+2
| | | | | | | | [ci skip]
* | Treat combined durations as a single unitSean Griffin2016-11-292-3/+20
|/ | | | | | | | | | | | Prior to this commit, `3.months - 3.months` would result in a duration that has the "parts" of `[[:months, 3], [:months, -3]]`. This would mean that it was subtly different than `2.months - 2.months`. When applied to a time, the date might actually change if the resulting day doesn't exist however many months in the future, even though in both cases we just wanted to add `0`, which should always be an identity operation. With this change, we now store the parts as a hash, so `3.months - 3.months` is simply stored as `{ months: 0 }`.
* Merge pull request #27126 from kamipo/fix_unsigned_with_zerofillRafael França2016-11-294-2/+9
|\ | | | | Fix that unsigned with zerofill is treated as signed
| * Fix that unsigned with zerofill is treated as signedRyuta Kamizono2016-11-274-2/+9
| | | | | | | | Fixes #27125.
* | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
| |
* | Add CHANGELOG entry for --yarn optionLiceth Ovalles2016-11-291-0/+5
| |
* | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-298-3/+106
|\ \ | | | | | | Add Yarn support in new apps using --yarn option
| * | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8
| | |
| * | Add node_modules to default gitignoreLiceth Ovalles2016-11-281-0/+5
| | |
| * | Add node_modules path to assets load paths when --yarn option is usedLiceth Ovalles2016-11-282-0/+5
| | |
| * | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-284-1/+88
| | |
* | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-296-17/+2
| | |
* | | Merge pull request #27204 from JessRudder/22862-auth-note-on-testsJon Moss2016-11-281-0/+7
|\ \ \ | | | | | | | | Add note about step needed to get tests to pass if you implemented basic auth [ci skip]
| * | | Add note about step needed to get tests to pass if you implemented basic ↵JessRudder2016-11-281-0/+7
|/ / / | | | | | | | | | auth [ci skip]
* | | Merge pull request #27196 from kirs/rubocop-gemRafael França2016-11-282-0/+16
|\ \ \ | | | | | | | | Add rubocop to Gemfile
| * | | Add rubocop to GemfileKir Shatrov2016-11-282-0/+16
| | | |
* | | | Merge pull request #27195 from y-yagi/use_public_module_includeSantiago Pastorino2016-11-273-3/+3
|\ \ \ \ | | | | | | | | | | use public Module#include instead of send :include
| * | | | use public Module#include instead of send :includeyuuji.yaginuma2016-11-273-3/+3
| | | | | | | | | | | | | | | | | | | | Follow up to #18767
* | | | | Merge pull request #27190 from jnoortheen/issue-27189Santiago Pastorino2016-11-271-3/+4
|\ \ \ \ \ | | | | | | | | | | | | I found this issue and wanted to give the fix.
| * | | | | fix: solves issue#27189jnoortheen2016-11-271-3/+4
| | | | | |
* | | | | | Merge pull request #27193 from plentz/masterSantiago Pastorino2016-11-272-2/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixing update_all and delete_all when chained with left_joins
| * | | | | | fixing update_all and delete_all when chained with left_joins. fixes #27192Diego Plentz2016-11-272-2/+28
|/ / / / / /
* / / / / / [ci skip] Update the `as` docs.Kasper Timm Hansen2016-11-271-1/+2
|/ / / / / | | | | | | | | | | | | | | | Mention the Accept header and how that figures into the request format.
* | | | / Remove default argument value.Kasper Timm Hansen2016-11-271-1/+1
| |_|_|/ |/| | | | | | | | | | | Wrongly added when fixing the request path wrangling.
* | | | Merge pull request #26865 from ↵Matthew Draper2016-11-273-4/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | sergey-alekseev/uniqueness-validation-scope-with-polymorphic-association fix the uniqueness validation scope with a polymorphic association
| * | | | fix the uniqueness validation scope with a polymorphic associationSergey Alekseev2016-11-263-4/+23
| | | | | | | | | | | | | | | | | | | | https://gist.github.com/sergey-alekseev/946657ebdb5e58d1bee115714056ec96
* | | | | abort_on_exception can't be disabled for a single threadMatthew Draper2016-11-272-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | If it's enabled globally, it's on regardless of how individual threads are set.
* | | | | Only start rabbitmq when we need itMatthew Draper2016-11-271-6/+19
| | | | |
* | | | | We expect exceptions; abort will just raise in the wrong placeMatthew Draper2016-11-272-9/+17
| | | | |
* | | | | Clear available connections immediatelyMatthew Draper2016-11-271-0/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It'll be re-cleared when it's rebuilt in with_new_connections_blocked's ensure, but we still need to clear it inside this synchronize -- we've disconnected connections that may be available in the queue, and while other threads are not allowed to make *new* connections, they are still allowed to take existing ones from there. This was incorrectly removed in d314646c965b045724e6bdb9d61dcecfabc0ba8f.
* | | | Merge pull request #27183 from maclover7/jm-av-releaseGuillermo Iguaran2016-11-261-5/+7
|\ \ \ \ | |/ / / |/| | | Update RELEASING_RAILS.md for rails-ujs
| * | | Update RELEASING_RAILS.md for rails-ujsJon Moss2016-11-261-5/+7
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #27182 from maclover7/jm-actionview-buildGuillermo Iguaran2016-11-261-1/+9
|\ \ \ | | | | | | | | Add asset compilation Rake task for UJS
| * | | Add asset compilation Rake task for UJSJon Moss2016-11-261-1/+9
|/ / / | | | | | | | | | | | | Uses same build pipeline (Blade) as Action Cable. Will run when Rails gems are being built for release.
* | | Add UJS testsGuillermo Iguaran2016-11-2622-0/+5280
| | |
* | | Add rails-ujs to Action ViewGuillermo Iguaran2016-11-2614-0/+649
| | |
* | | Convert ActionView::Railtie into EngineGuillermo Iguaran2016-11-261-1/+1
| | |
* | | Make the test that seems to be getting stuck noisierMatthew Draper2016-11-261-35/+55
| | | | | | | | | | | | | | | I assume it's upset because of the change in d314646c965b045724e6bdb9d61dcecfabc0ba8f, but I don't yet understand why.
* | | Merge pull request #27179 from y-yagi/follow_up_to_8e1714bMatthew Draper2016-11-261-1/+1
|\ \ \ | | | | | | | | use correct variable in BacktraceCleaner test
| * | | use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
|/ / / | | | | | | | | | `@target_dir` variable was changed to local variable in 8e1714b.
* | | We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9Akira Matsuda2016-11-251-1/+0
| | |
* | | Merge pull request #27140 from ↵Rafael França2016-11-253-2/+20
|\ \ \ | | | | | | | | | | | | | | | | supercaracal/fix-force-ssl-if-session-store-disabled Fix a force ssl redirection bug that occur when session store disabled.
| * | | Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-243-25/+19
| | | |
| * | | Fix a force ssl redirection bug that occur when session store disabled.Taishi Kasuga2016-11-222-1/+25
| | | |
* | | | Merge pull request #23675 from kachick/activemodel-errors-indifferentRafael França2016-11-253-5/+19
|\ \ \ \ | | | | | | | | | | Adjust to indifferent access around some ActiveModel::Errors methods
| * | | | Allow indifferent access in ActiveModel::ErrorsKenichi Kamiya2016-11-223-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `#[]` has already applied indifferent access, but some methods does not. `#include?`, `#has_key?`, `#key?`, `#delete` and `#full_messages_for`.
* | | | | Merge pull request #27165 from ↵Rafael França2016-11-252-6/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/followup-uuid-extension-change Followup of UUID default extension in the docs
| * | | | | Followup of UUID default extension in the docs [ci skip]Prathamesh Sonpatki2016-11-242-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mentioned clearly that for PostgreSQL < 9.4, you need to pass the default option with "uuid_generate_v4()" - Also updated PostgreSQL Active Record guide with this change. - https://github.com/rails/rails/pull/25395#r66877078
* | | | | | Merge pull request #26874 from tgxworld/fix_broadcast_loggerMatthew Draper2016-11-252-5/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | `Broadcast#silence` breaks custom loggers that do not include `Logg…
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 00:37:27 +0000