Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add node_modules to default gitignore | Liceth Ovalles | 2016-11-28 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | Add node_modules path to assets load paths when --yarn option is used | Liceth Ovalles | 2016-11-28 | 2 | -0/+5 | |
| | | | | ||||||
| * | | | Add package.json for Yarn if --yarn option is added | Liceth Ovalles | 2016-11-28 | 4 | -1/+88 | |
| | | | | ||||||
* | | | | rails-ujs is now shipped with Action View | Guillermo Iguaran | 2016-11-29 | 6 | -17/+2 | |
| | | | | ||||||
* | | | | Merge pull request #27204 from JessRudder/22862-auth-note-on-tests | Jon Moss | 2016-11-28 | 1 | -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 ↵ | JessRudder | 2016-11-28 | 1 | -0/+7 | |
|/ / / / | | | | | | | | | | | | | auth [ci skip] | |||||
* | | | | Merge pull request #27196 from kirs/rubocop-gem | Rafael França | 2016-11-28 | 2 | -0/+16 | |
|\ \ \ \ | | | | | | | | | | | Add rubocop to Gemfile | |||||
| * | | | | Add rubocop to Gemfile | Kir Shatrov | 2016-11-28 | 2 | -0/+16 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #27195 from y-yagi/use_public_module_include | Santiago Pastorino | 2016-11-27 | 3 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | use public Module#include instead of send :include | |||||
| * | | | | use public Module#include instead of send :include | yuuji.yaginuma | 2016-11-27 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | Follow up to #18767 | |||||
* | | | | | Merge pull request #27190 from jnoortheen/issue-27189 | Santiago Pastorino | 2016-11-27 | 1 | -3/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | I found this issue and wanted to give the fix. | |||||
| * | | | | | fix: solves issue#27189 | jnoortheen | 2016-11-27 | 1 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #27193 from plentz/master | Santiago Pastorino | 2016-11-27 | 2 | -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 #27192 | Diego Plentz | 2016-11-27 | 2 | -2/+28 | |
|/ / / / / / | ||||||
* / / / / / | [ci skip] Update the `as` docs. | Kasper Timm Hansen | 2016-11-27 | 1 | -1/+2 | |
|/ / / / / | | | | | | | | | | | | | | | | Mention the Accept header and how that figures into the request format. | |||||
* | | | / | Remove default argument value. | Kasper Timm Hansen | 2016-11-27 | 1 | -1/+1 | |
| |_|_|/ |/| | | | | | | | | | | | Wrongly added when fixing the request path wrangling. | |||||
* | | | | Merge pull request #26865 from ↵ | Matthew Draper | 2016-11-27 | 3 | -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 association | Sergey Alekseev | 2016-11-26 | 3 | -4/+23 | |
| | | | | | | | | | | | | | | | | | | | | https://gist.github.com/sergey-alekseev/946657ebdb5e58d1bee115714056ec96 | |||||
* | | | | | abort_on_exception can't be disabled for a single thread | Matthew Draper | 2016-11-27 | 2 | -6/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | If it's enabled globally, it's on regardless of how individual threads are set. | |||||
* | | | | | Only start rabbitmq when we need it | Matthew Draper | 2016-11-27 | 1 | -6/+19 | |
| | | | | | ||||||
* | | | | | We expect exceptions; abort will just raise in the wrong place | Matthew Draper | 2016-11-27 | 2 | -9/+17 | |
| | | | | | ||||||
* | | | | | Clear available connections immediately | Matthew Draper | 2016-11-27 | 1 | -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-release | Guillermo Iguaran | 2016-11-26 | 1 | -5/+7 | |
|\ \ \ \ | |/ / / |/| | | | Update RELEASING_RAILS.md for rails-ujs | |||||
| * | | | Update RELEASING_RAILS.md for rails-ujs | Jon Moss | 2016-11-26 | 1 | -5/+7 | |
|/ / / | | | | | | | | | | [ci skip] | |||||
* | | | Merge pull request #27182 from maclover7/jm-actionview-build | Guillermo Iguaran | 2016-11-26 | 1 | -1/+9 | |
|\ \ \ | | | | | | | | | Add asset compilation Rake task for UJS | |||||
| * | | | Add asset compilation Rake task for UJS | Jon Moss | 2016-11-26 | 1 | -1/+9 | |
|/ / / | | | | | | | | | | | | | Uses same build pipeline (Blade) as Action Cable. Will run when Rails gems are being built for release. | |||||
* | | | Add UJS tests | Guillermo Iguaran | 2016-11-26 | 22 | -0/+5280 | |
| | | | ||||||
* | | | Add rails-ujs to Action View | Guillermo Iguaran | 2016-11-26 | 14 | -0/+649 | |
| | | | ||||||
* | | | Convert ActionView::Railtie into Engine | Guillermo Iguaran | 2016-11-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | Make the test that seems to be getting stuck noisier | Matthew Draper | 2016-11-26 | 1 | -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_8e1714b | Matthew Draper | 2016-11-26 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | use correct variable in BacktraceCleaner test | |||||
| * | | | use correct variable in BacktraceCleaner test | yuuji.yaginuma | 2016-11-26 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | `@target_dir` variable was changed to local variable in 8e1714b. | |||||
* | | | We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9 | Akira Matsuda | 2016-11-25 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge pull request #27140 from ↵ | Rafael França | 2016-11-25 | 3 | -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 Kasuga | 2016-11-24 | 3 | -25/+19 | |
| | | | | ||||||
| * | | | Fix a force ssl redirection bug that occur when session store disabled. | Taishi Kasuga | 2016-11-22 | 2 | -1/+25 | |
| | | | | ||||||
* | | | | Merge pull request #23675 from kachick/activemodel-errors-indifferent | Rafael França | 2016-11-25 | 3 | -5/+19 | |
|\ \ \ \ | | | | | | | | | | | Adjust to indifferent access around some ActiveModel::Errors methods | |||||
| * | | | | Allow indifferent access in ActiveModel::Errors | Kenichi Kamiya | 2016-11-22 | 3 | -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ça | 2016-11-25 | 2 | -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 Sonpatki | 2016-11-24 | 2 | -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_logger | Matthew Draper | 2016-11-25 | 2 | -5/+21 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | `Broadcast#silence` breaks custom loggers that do not include `Logg… | |||||
| * | | | | | | `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`. | Guo Xiang Tan | 2016-10-24 | 2 | -5/+21 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #27174 from kamipo/fix_require_dependency_message_format | Matthew Draper | 2016-11-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix `require_dependency` message format | |||||
| * | | | | | | | Fix `require_dependency` message format | Ryuta Kamizono | 2016-11-25 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `depend_on` message format is `"No such file to load -- %s.rb"`. But `require_dependency` message is missing `.rb` suffix. ``` % git grep -n 'No such file to load' actionview/test/actionpack/abstract/helper_test.rb:112: assert_equal "No such file to load -- very_invalid_file_name.rb", e.message activesupport/lib/active_support/dependencies.rb:245: def require_dependency(file_name, message = "No such file to load -- %s.rb") activesupport/lib/active_support/dependencies.rb:333: def depend_on(file_name, message = "No such file to load -- %s.rb") ``` | |||||
* | | | | | | | | Merge pull request #27173 from kamipo/fix_warning_method_redefined | Matthew Draper | 2016-11-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix warning: method redefined; discarding old fields | |||||
| * | | | | | | | | Fix warning: method redefined; discarding old fields | Ryuta Kamizono | 2016-11-25 | 1 | -1/+1 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26976. | |||||
* | | | | | | | | Merge pull request #27172 from kamipo/should_test_change_column_default | Matthew Draper | 2016-11-25 | 1 | -13/+13 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest` | |||||
| * | | | | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest` | Ryuta Kamizono | 2016-11-25 | 1 | -13/+13 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Follow up to #25395. | |||||
* | | | | | | | Merge pull request #27171 from kamipo/suppress_migration_message | Matthew Draper | 2016-11-25 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Suppress migration message in the test | |||||
| * | | | | | | | Suppress migration message in the test | Ryuta Kamizono | 2016-11-25 | 1 | -0/+4 | |
| | | | | | | | |