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
Charlie Somerville
4040266a60
update Gemfile.lock and vendor/cache
2014-09-15 14:09:33 +10:00
Charlie Somerville
7684d715ef
Merge remote-tracking branch 'upstream/3-2-stable' into 3-2-github
2014-09-15 14:04:33 +10:00
Charlie Somerville
9cbc2c3550
ci on ruby 2.1.2
2014-09-15 14:02:45 +10:00
Charlie Somerville
aa7515977f
bundle --local
2014-09-15 14:01:51 +10:00
Santiago Pastorino
11fd052aa8
Regenerate sid when sbdy tries to fixate the session
...
Fixed broken test.
Thanks Stephen Richards for reporting.
2014-08-04 11:36:43 -03:00
Rafael Mendonça França
c43f20a404
Merge branch '3-2-sec' into 3-2-stable
2014-07-02 14:18:47 -03:00
Rafael Mendonça França
53c845cb18
Preparing for 3.2.19 release
2014-07-02 12:55:09 -03:00
Rafael Mendonça França
1f2192e46d
Check against bit string values using multiline regexp
...
Fix CVE-2014-3482.
2014-07-02 12:49:01 -03:00
Rafael Mendonça França
3622858ed5
Use a version of execjs compatible with Ruby 1.8
2014-06-26 22:10:32 -03:00
Rafael Mendonça França
297bff7f8f
Make sure Active Support configurations are applied correctly
...
Before this patch configuration set using config.active_support
would not be set.
Closes #15364
2014-06-26 18:40:23 -03:00
Guillermo Iguaran
bc90ea63e9
Revert "Merge pull request #15794 from vishalzambre/patch-1"
...
This reverts commit 6d800a909e6a051299f9
2014-06-18 00:37:46 -05:00
Guillermo Iguaran
6d800a909e
Merge pull request #15794 from vishalzambre/patch-1
...
File.exists? is a deprecated name, use File.exist?
2014-06-18 00:33:00 -05:00
Vishal Zambre
fca3cc23fa
File.exists? is a deprecated name, use File.exist?
...
File.exists? is a deprecated name, use File.exist?
2014-06-18 10:51:27 +05:30
Aaron Patterson
6a051299f9
Feature detect based on Ruby version.
...
I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob
returns the wrong value on Ruby less than 2.2.0. Checking for a
case-insensitive FS seems too hard, so just check Ruby version Checking
for a case-insensitive FS seems too hard, so just check Ruby version.
2014-05-18 12:00:57 -07:00
Aaron Patterson
c40df47055
feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053
2014-05-10 11:53:02 -07:00
Aaron Patterson
03e016f22a
use fnmatch to test for case insensitive file systems
...
this is due to:
https://bugs.ruby-lang.org/issues/5994
2014-05-09 14:46:46 -07:00
Rafael Mendonça França
bbec7d72be
Merge branch '3-2-sec' into 3-2-stable
...
Conflicts:
actionpack/CHANGELOG.md
2014-05-06 13:31:07 -03:00
Rafael Mendonça França
50d6b4549d
Fix broken tests of the previous release
2014-05-06 13:03:21 -03:00
Rafael Mendonça França
4e8f1d2588
Preparing for 3.2.18 release
2014-05-06 11:33:10 -03:00
Rafael Mendonça França
0f3b7d1a31
Only accept actions without File::SEPARATOR in the name.
...
This will avoid directory traversal in implicit render.
Fixes: CVE-2014-0130
2014-05-05 11:37:34 -03:00
Charlie Somerville
4bbf1da870
Merge pull request #57 from github/3-2-github+builder-3.2
...
Bump to builder 3.2
2014-04-10 23:04:35 +10:00
Charlie Somerville
a54e2e4a72
bump to builder 3.2
2014-04-10 22:53:51 +10:00
Charlie Somerville
c5cb8cd58f
commit unrelated Gemfile changes
2014-04-10 22:53:51 +10:00
Charlie Somerville
1f230b83a5
Merge pull request #56 from github/3-2-github+ci
...
Get 3-2-github CI'd
2014-04-10 21:51:16 +10:00
