Commit Graph

59793 Commits

Author SHA1 Message Date
Rafael Mendonça França
79a5ea9ead
Remove deprecated support to :text in render 2016-10-10 00:02:52 -03:00
Rafael Mendonça França
57e1c99a28
Remove deprecated support to :nothing in render 2016-10-09 23:58:24 -03:00
Rafael Mendonça França
333bfd896e
Remove deprecated support to :back in redirect_to 2016-10-09 23:57:49 -03:00
Rafael Mendonça França
a2762d95c6
Remove deprecated support for status option in head 2016-10-09 23:57:13 -03:00
Rafael Mendonça França
6c24e47eda
Remove deprecation at ActionController::BadRequest 2016-10-09 23:56:14 -03:00
Rafael Mendonça França
d7be30e8ba
Remove deprecated methods related to controller filters
`skip_action_callback`, `skip_filter`, `before_filter`,
`prepend_before_filter`, `skip_before_filter`,
`append_before_filter`, `around_filter`
`prepend_around_filter`, `skip_around_filter`,
`append_around_filter`, `after_filter`,
`prepend_after_filter`, `skip_after_filter` and
`append_after_filter`.
2016-10-09 23:56:14 -03:00
Rafael França
02989ee38f Merge pull request #26735 from kamipo/prevent_to_create_blank_comment
Prevent to create blank comment
2016-10-09 23:45:24 -03:00
Rafael França
88e00d303d Merge pull request #26738 from bogdanvlviv/travis
Don't allow tests ac:integration to failure
2016-10-09 23:34:47 -03:00
Jon Moss
743dba533e Merge pull request #26740 from y-yagi/update_retry_on_example
correct exception class in `retry_on` example [ci skip]
2016-10-08 19:51:42 -04:00
yuuji.yaginuma
be199dfae2 correct exception class in retry_on example [ci skip]
If the deadlock has occurred `ActiveRecord::Deadlocked` will raise.
Ref: #25107, #26059
2016-10-09 08:46:31 +09:00
bogdanvlviv
6150973407 Don't allow tests ac:integration to failure 2016-10-08 23:05:20 +03:00
Matthew Draper
f977004cc6 Revert "Temporarily make ACa tests noiser and more predictable"
This reverts commit 2d6c14bca25c5629e431a802c3053bad1e378fcc.
2016-10-08 10:51:06 +10:30
Matthew Draper
253ddeb3ce Merge pull request #26732 from matthewd/fixnum-warning
Fixnum and Bignum are deprecated in Ruby trunk
2016-10-08 10:50:36 +10:30
Ryuta Kamizono
72bf3ded09 Prevent to create blank comment
Currently blank comment does not dump to `db/schema.rb`. But created it
even if specified blank.
2016-10-08 09:04:50 +09:00
Matthew Draper
cb0452e9a5 Fixnum and Bignum are deprecated in Ruby trunk
https://bugs.ruby-lang.org/issues/12739
2016-10-08 08:13:11 +10:30
Rafael França
fb4dc32245 Merge pull request #26729 from rails/bump-sdoc
Bump sdoc to 1.0.0.beta2 which includes fix to support Ruby 2.4
2016-10-07 15:32:09 -04:00
Rafael Mendonça França
9bd6499b5a
Silence a warning 2016-10-07 15:21:48 -04:00
Rafael Mendonça França
5dde413e1d
Undefine assings in IntegrationTest
assigns assert the state of a controller instance what should not be
done in an integration test.
2016-10-07 15:20:58 -04:00
Xavier Noria
f94a14d2c2 Merge pull request #26730 from rails/explain-why-inverse_of-is-disabled
explain why autosave= disables inverse_of [ci skip]
2016-10-07 18:29:33 +02:00
Xavier Noria
13af342c34 explain why autosave= disables inverse_of [ci skip] 2016-10-07 18:26:45 +02:00
Matthew Draper
fc0b62597f Tweak a test so the queries match 2016-10-08 02:52:43 +10:30
Zachary Scott
db85fa1db4 Include sdoc 1.0.0.beta2 which includes updated rdoc w/o hard json dep 2016-10-07 18:51:27 +09:00
Zachary Scott
91efc4fc0b Bump sdoc to 1.0.0.beta1 which includes fix to support Ruby 2.4 2016-10-07 18:42:22 +09:00
Matthew Draper
3127e99d6e Simplify serializable test to avoid mystery deadlock 2016-10-07 09:28:36 +10:30
Matthew Draper
3a11c5b626 Merge pull request #26714 from matthewd/close-race
Work around read/close race (x2)
2016-10-07 04:30:08 +10:30
Eileen M. Uchitelle
fd9abbc446 Merge pull request #24963 from fertapric/recover-db-runtime-on-production-logs
Fix database runtimes on production log
2016-10-06 12:09:51 -04:00
Matthew Draper
1fe967d0c9 Wait for the socket to be closed asynchronously 2016-10-06 13:12:35 +10:30
Matthew Draper
acd7ba795e Use a branch of websocket-client-simple, to work around read/close race 2016-10-06 12:51:26 +10:30
Matthew Draper
4a7c5685c8 Close the IO from the read loop thread
IO#close and IO#read across threads don't get along so well:

After T1 enters #read and releases the GVL, T2 can call #close on the
IO, thereby both closing the fd and freeing the buffer while T1 is using
them.
2016-10-06 10:31:14 +10:30
Matthew Draper
bf5876af09 Merge pull request #26631 from kamipo/remove_duplicate_condition
Remove duplicated `unless current_adapter?(:SQLite3Adapter)` condition
2016-10-06 02:41:17 +10:30
Matthew Draper
32e3ad7e37 Merge pull request #26633 from kamipo/text_too_big_should_be_text
`:text_too_big` column should be `:text`, not `:integer`
2016-10-06 02:40:21 +10:30
Matthew Draper
e16b5b4338 Merge pull request #25304 from kbrock/calculate_attributes
Use attribute_names over column_names
2016-10-06 02:38:25 +10:30
Matthew Draper
0464b728e2 Merge pull request #26359 from maclover7/jm-speed-up-time
Speed up Time.zone.now
2016-10-06 02:35:35 +10:30
Jon Moss
161b6079b5 Merge pull request #26710 from kenta-s/change-page-change-to-turbolinks-load
Change page:change to turbolinks:load in README.md [ci skip]
2016-10-05 08:52:52 -04:00
kenta-s
a0f871f95a Change page:change to turbolinks:load in README.md [ci skip] 2016-10-05 19:41:27 +09:00
Sean Griffin
de9a56b66a Merge pull request #24571 from raimo/patch-1
Print the proper ::Float::INFINITY value when used as a default value
2016-10-04 17:37:04 -04:00
Matthew Draper
4d6feef792 Merge pull request #26684 from matthewd/executor-serial
Avoid bumping the class serial when invoking executor
2016-10-05 05:23:48 +10:30
Matthew Draper
6ecb14715e Merge pull request #26686 from matthewd/deprecation-caller
Correct caller tracking in delegated deprecation methods
2016-10-05 05:23:20 +10:30
Keenan Brock
27f8f74ebf Use attribute_names over column_names 2016-10-04 10:02:03 -04:00
Andrew White
0fc115724b Merge pull request #26693 from iainbeeston/consistently-use-activerecord-attributes
Made ActiveRecord consistently use ActiveRecord::Type (not ActiveModel::Type)
2016-10-04 10:02:34 +01:00
Andrew White
16bb6122e2 Merge pull request #26701 from kamipo/restore_gemfile_lock_entries
Restore missing Gemfile.lock entries
2016-10-04 10:00:14 +01:00
Ryuta Kamizono
432cc58a29 Restore missing Gemfile.lock entries
These lines were lost in https://github.com/rails/rails/pull/26695/files#diff-e79a60dc6b85309ae70a6ea8261eaf95L192.
2016-10-04 09:25:31 +09:00
Jon Moss
c3005e0a31 Merge pull request #26699 from Neodelf/request_id
[ci-skip] Swap method and its alias, format doc
2016-10-03 18:01:31 -04:00
Andrey Molchanov
9a130ee465 [ci-skip] Swap method and its alias, format doc 2016-10-04 00:37:40 +03:00
Matthew Draper
39fb3069f8 Don't shut down adapters that haven't been set
We hit when we skip the PostgreSQL adapter.
2016-10-04 06:40:38 +10:30
Iain Beeston
671eb742ee Made ActiveRecord consistently use ActiveRecord::Type (not
ActiveModel::Type)

Some code was previously referring to ActiveModel::Type::*. This could
cause issues in the future if any of the ActiveRecord::Type classes were
overridden in the future.
2016-10-03 16:42:26 +01:00
Eileen M. Uchitelle
60cc506475 Merge pull request #26695 from MentalPower/master
Allow the use of listen's 3.1.x branch.
2016-10-03 09:11:08 -04:00
Esteban Santana Santana
ddddedc487 Allow the use of listen's 3.1.x branch.
When the initial evented monitor feature was written, the latest version of listen
was the 3.0.x series. Since then the listen project has moved on to the 3.1.x series.
This patch allows the use of the new versions.
2016-10-03 16:58:17 +05:30
Andrew White
8058ece4fe Merge pull request #26555 from chriscarter90/unmatched-constraint-routing-messages
Show an "unmatched constraints" error when params fail to match constraints
2016-10-03 11:41:38 +01:00
Chris Carter
0b32e2dff3 Show an "unmatched constraints" error for mismatching and present params
Currently a misleading "missing required keys" error is thrown when a param
fails to match the constraints of a particular route. This commit ensures that
these params are recognised as unmatching rather than missing.

Note: this means that a different error message will be provided between
optimized and non-optimized path helpers, due to the fact that the former does
not check constraints when matching routes.

Fixes #26470.
2016-10-03 09:52:14 +01:00