AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-10 07:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
19,349 Commits 34 Branches 105 Tags
3-0-github+ar-3-2
Commit Graph

19349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlie Somerville
1d8e847277 AR 3.0 railtie 2014-04-29 16:38:51 +10:00
Charlie Somerville
cdc266782a skip this test 2014-04-29 16:28:10 +10:00
Charlie Somerville
145a6a2d91 add :nsec time format 2014-04-29 16:18:11 +10:00
Charlie Somerville
036b5f0eee 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-29 16:10:19 +10:00
Charlie Somerville
f11a82922c restore old notifier when we're done here 2014-04-29 16:09:08 +10:00
Charlie Somerville
f244e8a3d0 restore AR 3.0 session store 2014-04-29 16:09:05 +10:00
Charlie Somerville
ccfcff1a7c our old ActiveSupport doesn't support passing procs to assert_difference 2014-04-29 16:03:17 +10:00
Charlie Somerville
e32cfa92cd only test sqlite3 2014-04-29 16:02:31 +10:00
Charlie Somerville
8e3f4ab086 fix activemodel tests 2014-04-29 16:02:11 +10:00
Charlie Somerville
39c6f93b3d don't warn or be verbose 2014-04-29 15:56:46 +10:00
Charlie Somerville
f1e743fd37 add bcrypt-ruby to Gemfile 2014-04-29 15:55:44 +10:00
Charlie Somerville
5caa97d6dd import activesupport/core_ext/object/inclusion from 3-2-github 2014-04-29 15:53:37 +10:00
Charlie Somerville
5b1ea8dd82 fix up deps 2014-04-29 15:53:02 +10:00
Charlie Somerville
f86ff902bf activerecord and activemodel 3.2 2014-04-29 15:52:27 +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
Charlie Somerville
8069888f39 some respond_to? fixes 2014-03-19 21:28:37 +11:00
Charlie Somerville
0d1e06e91a don't pass nil elements into Hash[] 2014-03-19 21:28:25 +11:00
Charlie Somerville
b7fdf446b3 raise on respond_to changes 2014-03-19 21:11:52 +11:00
Charlie Somerville
6a5c4448bf respond_to? 2014-03-19 21:11:45 +11:00
Charlie Somerville
7824f7fe96 respond_to? fix 2014-03-19 20:13:22 +11:00
Charlie Somerville
cc24b24b00 nil is now encoded as <blah nil="true"/> 2014-03-19 19:55:22 +11:00
Charlie Somerville
997fe9a94e fix for ruby 2.0+ respond_to? changes 2014-03-19 19:54:35 +11:00
Charlie Somerville
9527562a4a add pry to gemfile to aid debugging 2014-03-19 19:54:11 +11:00
Charlie Somerville
db8c48caf7 add magic encoding comments to files with dodgy chars 2014-03-19 19:14:34 +11:00
Charlie Somerville
60eb2e5586 delete troublesome platforms 2014-03-19 19:08:56 +11:00
Charlie Somerville
12b11ea207 announce what ruby version we're running 2014-03-19 19:07:46 +11:00
Charlie Somerville
0d0a061f27 add script/cibuild 2014-03-19 19:02:21 +11:00
Charlie Somerville
66f4a900c6 vendor gems 2014-03-19 19:00:48 +11:00
Charlie Somerville
5f31e732ce Merge pull request #49 from github/3-0-kill-backtick-monkey-patch 
[3.0] Kill Object#` monkey patch
 2014-02-23 23:20:55 +11:00
Charlie Somerville
04f3d5048e kill Object#` monkey patch 2014-02-23 23:19:13 +11:00
Aman Gupta
bfe82ff609 add RouteSet#recognize_path(path, :extras => params) for forward-compat with rails4 2014-02-17 18:42:50 -08:00
Charlie Somerville
5ce29715d5 backport rails 3.2 ActiveSupport::MessageVerifier 2014-02-07 11:31:09 +11:00
Charlie Somerville
ec4d0a393c use builder ~> 3.2.0 2014-02-04 22:12:35 +11:00
Aman Gupta
0be816038d skip nil relative_url_root 2014-01-14 01:53:36 -08:00