Commit Graph

46947 Commits

Author SHA1 Message Date
Guillermo Iguaran
f3062be5d6 Merge pull request #16847 from prathamesh-sonpatki/kill-extra-has-been
Remove extra 'has been' from the deprecation message
2014-09-09 00:32:38 -05:00
Prathamesh Sonpatki
ceb9ca2193 Remove extra 'has been' from the deprecation message
- [ci skip]
2014-09-09 10:47:40 +05:30
Guillermo Iguaran
89d897e3a7 Merge pull request #16845 from todd/upgrade_guide_console_docs
Add docs for web-console to 4.2 Upgrade Guide
2014-09-08 23:17:02 -05:00
Todd Bealmear
453f5ecfde Add docs for web-console to 4.2 Upgrade Guide [ci skip] 2014-09-08 20:31:55 -07:00
Rafael Mendonça França
fb11038148 Do not memoize document_root_element in view tests
Memoizing will not make possible to assert the output of the view if it
is changed after the first assert_select call

Related with plataformatec/simple_form#1130 and rails/rails-dom-testing#15
2014-09-08 18:04:45 -03:00
Yves Senn
8683396dd8 Merge pull request #16827 from kuldeepaggarwal/f-disable-migration-logging
disable migrations logging while running test cases for AR schema tests
2014-09-08 11:50:15 +02:00
Matthew Draper
c3207a12be Merge pull request #16825 from cristianbica/fix-ar-nested-arrays
Fix query with nested array in Active Record
2014-09-08 13:12:04 +09:30
Guillermo Iguaran
42e69c352f Merge pull request #16834 from tchandy/removing_unused_fake_models
Removing unused fake models
2014-09-07 21:19:49 -05:00
Thiago Pradi
90c06717bc Removing unused fake models 2014-09-07 22:51:14 -03:00
Jeremy Kemper
23d1b92f97 Schema dumper: all connection adapters implement #primary_key, so rely on it exclusively 2014-09-07 18:37:00 -07:00
Santiago Pastorino
353b88135f Merge pull request #16830 from teeparham/schema_dumper
Cleanup SchemaDumper
2014-09-07 21:15:09 -03:00
Tee Parham
92fb0815ed Fix warnings for undefined local variable
* Add private method primary_key_for, which more clearly shows that the
expected return value is nil when a primary key is not found.
2014-09-07 16:52:01 -06:00
Tee Parham
95456eb4ef Prefer "if any?" to "unless empty?"
* Consistent whitespace
* Remove unnecessary parentheses
2014-09-07 16:52:01 -06:00
Tee Parham
4a1e2c3253 Convert string concatenations to substitutions 2014-09-07 16:51:56 -06:00
Zachary Scott
4c3b3a2518 Merge pull request #16832 from yuki24/use-match-via-all-in-custom-exceptions-app
[guides] Use `match ..., via: :all` in the custom exceptions app [ci skip]
2014-09-06 20:33:23 -07:00
Yuki Nishijima
7143e0da03 [guides] Use match ..., via: :all in the custom exceptions app [ci skip]
Using `get` results in an unexpected error page(returning empty body) for requests of other HTTP mehtods other than GET. Use `match ..., via:
:all` so the exceptions app can be more stable.
2014-09-06 19:55:17 -07:00
Jeremy Kemper
749e289554 Ignore segfault build errors with 2.0.0 + mysql-ruby
Continuation of c9a43126c5e2c608ab3ff1be994bce69e815a144

😢
2014-09-06 17:16:54 -07:00
Jeremy Kemper
f5383ee356 Merge pull request #16793 from javan/comply_with_rack_content_length_middleware
Add support for Rack::ContentLength middelware
2014-09-06 17:11:18 -07:00
Cristian Bica
72d1663bc7 Fix query with nested array in Active Record
`User.where(id: [[1,2],3])` was equal to `User.where(id:[1, 2, 3])`
in Rails 4.1.x but because of some refactoring in Arel this stopped
working in 4.2.0. This fixes it in Rails.

[Dan Olson & Cristian Bica]
2014-09-06 23:46:32 +03:00
Javan Makhmali
66f8997671 Add support for Rack::ContentLength middelware 2014-09-06 12:33:29 -04:00
Kuldeep Aggarwal
5663f06656 disable migrations logging while running test cases for AR schema tests 2014-09-06 21:44:08 +05:30
Akira Matsuda
da2f61947d Dynamically modified schema and association would not be correctly reset
This fixes <"SQLite3::SQLException: no such column: legacy_things.person_id: SELECT \"legacy_things\".* FROM \"legacy_things\" WHERE \"legacy_things\".\"person_id\" = ?">
in OptimisticLockingTest#test_lock_destroy
2014-09-06 23:28:18 +09:00
Jeremy Kemper
e11914b551 Merge pull request #16824 from rajcybage/action_view_content_tag
fix the undefined method content_tag #15245
2014-09-06 07:10:23 -07:00
Jeremy Kemper
8d75aa9cb3 Merge pull request #16822 from jeremy/deprecate-problematic-implicit-response-splatting
Deprecate implicit AD::Response splatting and Array conversion
2014-09-06 07:08:10 -07:00
Jeremy Kemper
2a78d6f561 Deprecate implicit AD::Response splatting and Array conversion 2014-09-06 07:05:59 -07:00
Rajarshi Das
ab2ace6bbe fix the undefined method content_tag #15245
not required include ActionView::Helpers::TagHelper in test as well
2014-09-06 12:09:01 +05:30
Godfrey Chan
381f9931ec Dependencies: bump to jquery-rails 4.0.0.beta2 2014-09-05 20:20:26 -07:00
Godfrey Chan
b1bc95bfa5 Use the released jquery-rails gem 2014-09-05 17:55:45 -07:00
Rafael Mendonça França
dc8a759552 Add TODO to release the gems before the next Rails release 2014-09-05 19:41:02 -03:00
Rafael Mendonça França
aca714eaa0 Merge pull request #16114 from seuros/test_clean
[Postgresql tests] Added enable_extension! to helper
2014-09-05 19:20:19 -03:00
Rafael Mendonça França
d12b9b2897 Remove CHANGELOG entry [ci skip] 2014-09-05 18:48:22 -03:00
Rafael Mendonça França
ad4ea98090 Do not mark object as persisted after an association is saved
Callback order in Active Record objects are important. Users should not
define callbacks before the association definition or surprising
behaviours like the described at #3798 will happen. This callback order
dependency is documented at 31bfcdc77c/activerecord/lib/active_record/associations.rb (L1222-1227).

This reverts #15728.

Fixes #16620.
2014-09-05 18:43:10 -03:00
Abdelkader Boudih
0ab9301f2a Added enable_extension! to helper 2014-09-05 21:20:17 +00:00
Rafael Mendonça França
31bfcdc77c ✂️ 2014-09-05 16:47:57 -03:00
Rafael Mendonça França
67117f7c5d Add test to assert_recognizes with custom message 2014-09-05 16:47:00 -03:00
Rafael Mendonça França
2bb19fa739 Message doesn't need to be optional 2014-09-05 16:46:52 -03:00
Rafael Mendonça França
3f720d580f Merge pull request #14911 from estsauver/14908
Propagate test messages through assert_routing helper, Fixes #14908
2014-09-05 16:43:14 -03:00
Matthew Draper
ccbb48196e Fix for inflector's incorrect camelCase replacement for acronyms
Fixes #8015, #9756.

[Fred Wu & Matthew Draper]
2014-09-06 04:56:25 +09:30
Rafael Mendonça França
9576605dfd Merge pull request #16818 from phoet/patch-4
world writable might be a bit too open...
2014-09-05 14:31:20 -03:00
Peter Schröder
d69e0ad39a world writable might be a bit too open... 2014-09-05 16:44:41 +02:00
Matthew Draper
7025d7769d For now, we will keep sorting the tests.
This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and
bd2b3fbe54e750ba97469a7896e8d143d6dfd465.
2014-09-05 23:33:27 +09:30
Santiago Pastorino
4c440a54e9 Merge pull request #16815 from seuros/ar-freeze-adapter-name
Freeze ADAPTER_NAME in adapters
2014-09-05 10:39:50 -03:00
Abdelkader Boudih
1fc9ddbd91 Freeze ADAPTER_NAME in adapters 2014-09-05 11:42:13 +00:00
Godfrey Chan
a8827cb9af Fixed regression with referencing polymorphic assoc in eager-load
This is cased by 03118bc + 9b5d603. The first commit referenced the undefined
local variable `column` when it should be using `reflection.type` as the lookup
key. The second commit changed `build_arel` to not modify the `bind_values` in-
place so we need to combine the arel's `bind_values` with the relation's when
building the SQL.

Fixes #16591

Related #15821 / #15892 / 7aeca50
2014-09-05 04:37:12 -07:00
Yves Senn
ce43e8a6fc Merge pull request #16807 from tgxworld/carry_out_assignment_within_block
Move variable assignment within logging block.
2014-09-05 09:12:37 +02:00
Andrew White
c4fbe14cac Merge pull request #16765 from Agis-/time-change-bug
Time#change throws exception with an out-of-range :usec
2014-09-05 07:51:08 +01:00
Zachary Scott
7d69eae78a Merge pull request #16813 from seuros/rdoc
Fix ActiveJob rdoc `enqueue` -> `perform_later` [ci skip]
2014-09-04 23:39:46 -07:00
Abdelkader Boudih
fbe116a248 correct rdoc [ci skip] 2014-09-05 06:35:19 +00:00
Guillermo Iguaran
9f52f04b5a Merge pull request #16809 from akshay-vishnoi/for_not_to_do_not
Cover all cases of `For not` --> `Do not`, related to #16804
2014-09-04 22:53:45 -05:00
Akshay Vishnoi
8f87a54199 cover all cases of For not --> Do not, related to #16804 2014-09-05 09:21:30 +05:30