Charlie Somerville
4fc14b1f71
3.2.19.github9
2014-11-10 15:30:19 +11:00
Charlie Somerville
7c89fc489d
Merge pull request #36 from github/3-2-github+ambiguous-times
...
Force a period when local times are ambiguous
2014-11-10 15:26:47 +11:00
John Barnette
7a559d389c
Force a period when local times are ambiguous
...
This commit includes the essence of
https://github.com/rails/rails/pull/17409 .
2014-11-10 12:56:35 +11:00
Dirkjan Bussink
726e996306
New version because of Proc#bind removal
2014-10-09 08:42:43 +02:00
Dirkjan Bussink
eadedf7189
Merge pull request #34 from github/dbussink/rails32-proc-bind
...
Remove Proc#bind from Rails 3.2
2014-10-09 08:42:11 +02:00
Dirkjan Bussink
c831f67d8b
Remove Proc#bind from Rails 3.2
2014-10-08 14:08:40 +02:00
Charlie Somerville
b6f150c40c
3.2.19.github7
2014-10-07 16:41:52 +11:00
Charlie Somerville
76ad4030e5
whoops, we don't want to create an output_buffer local
2014-10-07 16:35:37 +11:00
Charlie Somerville
0a3c7ba903
3.2.19.github6
2014-10-07 16:29:46 +11:00
Charlie Somerville
d69e65ab34
use bytesize and byteslice rather than length and slice!
2014-10-07 16:29:14 +11:00
Charlie Somerville
56d2614309
3.2.19.github5
2014-09-26 16:58:46 +10:00
Rob Sanheim
0afd326c36
Move commit exception handling to a method so we can override
...
It looks like these methods all get included into the AbstractAdapter,
and then in github/github we have our own Adapter as an internal gem.
So this should be easy enough to override in our vendor'ed adapter.
This will allow us to still grab errors that happen in `after_commit`
which would normally be swallowed in Rails 3.0 (and beyond).
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
2014-09-26 16:25:08 +10:00
Rob Sanheim
c957f5f609
only _run_commit_callbacks when destroyed or persisted:
...
should fix issues with commit callbacks getting called when the record
is not persisted (yet) in a inner transaction or due to some other edge
case.
see also caabed6c76
2014-09-26 16:19:59 +10:00
Charlie Somerville
90ded51cc1
3.2.19.github4
2014-09-26 15:42:58 +10:00
Charlie Somerville
74b7cb9868
Merge pull request #31 from github/3-2-github+json-sessions
...
[3.2] JSON sessions
2014-09-26 15:32:46 +10:00
Charlie Somerville
bce8b07309
ignore nil session["flash"]
2014-09-26 15:26:13 +10:00
Greg Ose
3fe553fa31
more like 3.2
2014-09-24 13:25:13 -05:00
Greg Ose
e1c7a232ca
update FlashHash for 3.2
2014-09-24 12:39:03 -05:00
Charlie Somerville
283923f530
we don't care about deserializing old marshal sessions anymore
2014-09-23 16:41:38 +10:00
Greg Ose
18d37237c4
attribute flash hash test source
2014-09-23 16:22:28 +10:00
Greg Ose
b30301bb6d
clearer comment on session value format
2014-09-23 16:22:25 +10:00
Greg Ose
d12475ba60
support old marshalled cookies
2014-09-23 16:22:15 +10:00
Greg Ose
d106a28675
not until 4.0
2014-09-23 16:22:10 +10:00
Greg Ose
67b3fd5cb8
Custom cookie serializer test
...
Adapted from
b23ffd0dac/actionpack/test/dispatch/cookies_test.rb (L382-L413)
2014-09-23 16:21:49 +10:00
Greg Ose
0342deaa22
update flash hash test for 3.0 backport
2014-09-23 16:21:44 +10:00
Greg Ose
91bbe59e17
add flash hash tests
2014-09-23 16:21:37 +10:00
Greg Ose
f0895f838f
📗 ? Update tests and FlashHash cleanup
...
* Make FlashHash more like 4.1 (654a2de7a9b97e087321
2014-09-23 16:19:09 +10:00
Greg Ose
c9a54ce81d
actually backport flash to 3.0 instead of 3.2
2014-09-23 16:16:54 +10:00
Greg Ose
f6844fc683
move serialization option from cookie option to global env option
2014-09-23 16:14:57 +10:00
Greg Ose
b09eac885e
initial conversion to rails 4 flash hash, debugging marshalling issue
2014-09-23 16:13:23 +10:00
Greg Ose
1edd8b587b
serializer option for cookie store
2014-09-23 16:07:59 +10:00
Charlie Somerville
7ed2b48747
3.2.19.github3
2014-09-19 18:26:43 +10:00
Charlie Somerville
8b5e2df964
shut this deprecation warning up for now
2014-09-19 18:26:17 +10:00
Charlie Somerville
7688a79035
Merge pull request #30 from github/3-2-github+timezones
...
[3.2] Unfuck timezones for db quoting
2014-09-19 18:25:37 +10:00
Charlie Somerville
ec80c63332
Time#to_time converts it back to local
2014-09-19 17:51:43 +10:00
Charlie Somerville
7edb47effd
dup before changing to utc
2014-09-19 17:51:39 +10:00
Charlie Somerville
24bdb8141e
fix tests
2014-09-19 17:51:27 +10:00
Charlie Somerville
78e6c36ba3
convert times to local when quoting for db
2014-09-19 17:50:29 +10:00
Charlie Somerville
923ee6adf8
3.2.19.github2
2014-09-18 18:05:34 +10:00
Arthur Neves
7cbeae9a5c
Make sure transaction state resets after commit
...
[fixes #12566 ]
Conflicts:
activerecord/test/cases/transaction_callbacks_test.rb
2014-09-18 14:23:36 +10:00
Charlie Somerville
e27d15746c
3.2.19.github1
2014-09-16 11:50:45 +10:00
Charlie Somerville
ff7bbf364f
Merge pull request #28 from github/3-2-github+rip-out-sprockets
...
[3.2] Rip out Sprockets
2014-09-16 11:49:05 +10:00
Charlie Somerville
7a882329ed
more
2014-09-15 15:00:13 +10:00
Charlie Somerville
730e5c4fa3
this test also
2014-09-15 14:49:45 +10:00
Charlie Somerville
e61bcf3d9d
kill this test
2014-09-15 14:47:21 +10:00
Charlie Somerville
7ce60331c3
more more more
2014-09-15 14:44:52 +10:00
Charlie Somerville
7d31e49b1e
rip out more sprockets stuffs
2014-09-15 14:38:42 +10:00
Charlie Somerville
7f3ec3496d
remove sprockets dependency
2014-09-15 14:36:51 +10:00
Charlie Somerville
88827a2cab
rip out a bunch of sprockets stuff
2014-09-15 14:35:28 +10:00
Charlie Somerville
94331729a1
rename SprocketsApp here to RackApp to not confuse me when grepping
2014-09-15 14:35:17 +10:00
