Charlie Somerville
3f8ef015dc
Merge pull request #61 from github/3-0-github+ar-3-1+fix-broken-where-behaviour
...
[3.0+AR3.1] Backport broken where merge fix
2014-04-20 12:55:56 +10:00
Charlie Somerville
f557a1939d
fix tests that were relying on AR's ridiculous behaviour
2014-04-20 12:53:31 +10:00
Charlie Somerville
75e8494706
fix activerecord's completely broken where clause merge semantics
2014-04-20 11:20:47 +10:00
Charlie Somerville
02a5abd751
fix the tests so they're not asserting wrong behaviour
2014-04-20 11:20:43 +10:00
Aaron Patterson
9b9c09705b
stop calling to_sym when building arel nodes [CVE-2013-1854]
2014-04-14 13:37:56 +10:00
Aaron Patterson
ccf76159b0
adding test for CVE
2014-04-14 13:37:55 +10:00
joernchen of Phenoelit
f4991a241d
Fix issue with attr_protected where malformed input could circumvent
...
protection
Fixes: CVE-2013-0276
2014-04-14 13:37:55 +10:00
Aaron Patterson
b43374fc2c
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
2014-04-14 13:37:55 +10:00
Carlos Antonio da Silva
474794099b
Be a bit less conservative with mysql in adapter
...
This will allow the new mysql 2.9.0 to be used, fixing our test issues.
2014-04-14 13:37:55 +10:00
Rafael Mendonça França
505fa63bdd
Require ActionController::Railtie in the default middleware stack.
...
This will make possible to do a frameworkless initialization since the
the default middleware stack is self contained.
2014-04-14 13:27:05 +10:00
Charlie Somerville
3f0c10f68e
Fix issue with private kernel methods and collection associations. Closes #2508
...
Change CollectionProxy#method_missing to use scoped.public_send, to
avoid a problem described in issue #2508 when trying to use class
methods with names like "open", that clash with private kernel methods.
Also changed the dynamic matcher instantiator to send straight to
scoped, to avoid another roundtrip to method_missing.
2014-04-12 14:32:49 +10:00
Charlie Somerville
a1ceb40d69
delegate pluck to scoped
2014-04-12 11:50:12 +10:00
Charlie Somerville
7addec5667
backport pluck to 3-0-github
2014-04-12 11:49:21 +10:00
Charlie Somerville
5a23d7824b
it's after, not to_cleanup
2014-04-11 22:29:24 +10:00
Charlie Somerville
755b02567b
ActionDispatch::Callbacks.to_prepare in 3.0
2014-04-11 22:23:38 +10:00
Charlie Somerville
d0c0866822
skip the remaining broken tests we don't care about
2014-04-11 20:37:21 +10:00
Charlie Somerville
e8898d2a08
restore old notifier when we're done here
2014-04-11 20:20:03 +10:00
Charlie Somerville
7d530b12af
restore AR 3.0 session store
2014-04-11 19:28:47 +10:00
Charlie Somerville
1e4d1c3785
more respond_to fixes
2014-04-11 19:20:51 +10:00
Charlie Somerville
406173e9d8
fix xml tests
2014-04-11 19:08:17 +10:00
Charlie Somerville
62b7eee239
work around ruby 2.0 respond_to? changes
2014-04-11 18:55:19 +10:00
Charlie Somerville
95d5f3f95d
Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
...
ActiveSupport::Dependencies now raises NameError if it finds an existing
constant in load_missing_constant. This better reflects the nature of
the error which is usually caused by calling constantize on a nested constant.
Closes #1423
Conflicts:
activesupport/CHANGELOG
2014-04-11 18:51:32 +10:00
Charlie Somerville
900b1d0a5b
our old ActiveSupport doesn't support passing procs to assert_difference
2014-04-11 18:36:46 +10:00
Charlie Somerville
aa55907991
this doesn't exist in the old version of rack we're testing with
2014-04-11 18:34:29 +10:00
Charlie Somerville
abafb2c8ca
only test sqlite3
2014-04-11 18:34:29 +10:00
Charlie Somerville
098de9d5c1
don't warn or be verbose
2014-04-11 18:34:29 +10:00
Charlie Somerville
9f7240dec6
fix activemodel tests
2014-04-11 18:34:29 +10:00
Charlie Somerville
d545a11016
remove 1.8 monkey patches that aren't valid anymore
2014-04-11 18:34:19 +10:00
Charlie Somerville
af6b19dba9
add bcrypt-ruby to Gemfile
2014-04-11 18:20:07 +10:00
Charlie Somerville
b6723d92a4
import activesupport/core_ext/object/inclusion from 3-2-github
2014-04-11 18:19:31 +10:00
Charlie Somerville
c796ff35ba
bump arel to 2.2.3
2014-04-11 18:18:44 +10:00
Charlie Somerville
ab72872f95
bump activemodel builder dependency to 3.2
2014-04-11 18:18:03 +10:00
Charlie Somerville
a010486798
ActiveRecord 3.1 and ActiveModel 3.1
2014-04-11 18:13:28 +10:00
Charlie Somerville
494fc9ea8a
fix flakey logger test
2014-04-11 16:37:54 +10:00
Charlie Somerville
de6c5564e4
check in Gemfile.lock
2014-04-11 16:35:06 +10:00
Charlie Somerville
3542d3d623
delegate pluck to scoped
...
cc @rsanheim
2014-04-10 17:20:30 +10:00
Charlie Somerville
b714de3f2b
Merge pull request #55 from github/3-0-github+pluck
...
Backport pluck to 3-0-github
2014-04-10 15:58:34 +10:00
Charlie Somerville
3cf7ccde48
backport pluck to 3-0-github
2014-04-10 15:52:38 +10:00
Dirkjan Bussink
ad50d74a13
Merge pull request #54 from github/dbussink/bump-rails30-exception
...
Don't rescue toplevel Exception
2014-04-02 12:40:54 +00:00
Dirkjan Bussink
117dc4a85a
Don't rescue toplevel Exception
2014-03-31 13:46:20 +02:00
Charlie Somerville
be36d0222b
Merge pull request #52 from github/3-0-github-byteslice-cache
...
Use byteslice instead of slice in fragment_for
2014-03-31 19:15:33 +11:00
Charlie Somerville
1064e75c63
use byteslice instead of slice in fragment_for
2014-03-31 19:11:18 +11:00
Charlie Somerville
787f31dd95
Merge pull request #50 from github/3-0-github+ci
...
Run tests for 3-0-github in CI
2014-03-31 14:08:42 +11:00
Charlie Somerville
063f7ec6d9
delete debugging code
2014-03-20 13:48:55 +11:00
Charlie Somerville
512cc3fde1
in fact forget the railties tests
2014-03-20 13:44:04 +11:00
Charlie Somerville
a544354455
just test on sqlite3
2014-03-19 23:18:55 +11:00
Charlie Somerville
f973bd7a37
god rails is a shit show
2014-03-19 23:16:26 +11:00
Charlie Somerville
eedf2e0df5
add some skips and small tweaks to get tests passing
2014-03-19 22:57:30 +11:00
Charlie Somerville
478459b602
fix activesupport tests
2014-03-19 21:54:45 +11:00
Charlie Somerville
8405a07588
fix actionmailer tests
2014-03-19 21:42:36 +11:00
