| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | A blank line is required before code blocks. The generated output breaks ↵ | João Britto | 2012-06-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | otherwise. | |||||
| | * | | | on CSRF whitelisting the argument for :if must be a symbol | Daniel Lopes | 2012-06-07 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | fix typos on the CSRF whitelisting doc | Daniel Lopes | 2012-06-07 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Document the CSRF whitelisting on get requests | Daniel Lopes | 2012-06-07 | 1 | -5/+16 | |
| | | | | | ||||||
| | * | | | Document ActiveSupport::JSON.parse_error [ci skip] | Mark Rushakoff | 2012-06-05 | 1 | -0/+8 | |
| | | | | | ||||||
| | * | | | add :nodoc: to AS::NumberHelper private methods [ci skip] | Francesco Rodriguez | 2012-06-05 | 1 | -99/+100 | |
| | | | | | ||||||
| | * | | | add example to AS::Gzip | Francesco Rodriguez | 2012-06-04 | 1 | -1/+8 | |
| | | | | | ||||||
| | * | | | remove double hyphen that doesn't allow properly parsing | Francesco Rodriguez | 2012-06-04 | 1 | -5/+1 | |
| | | | | | ||||||
| | * | | | Add a note about JavaScript runtime | John Yani | 2012-06-05 | 1 | -0/+7 | |
| | | | | | ||||||
| | * | | | Merge pull request #103 from Vanuan/contributing | John Yani | 2012-06-04 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | bundle exec is needed even if running a single test. | |||||
| | | * | | | bundle exec is needed even if running a single test. | John Yani | 2012-06-04 | 1 | -1/+1 | |
| | |/ / / | ||||||
| | * | | | remove unnecessary text | Hrvoje Šimić | 2012-06-04 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | AV::TestCase does not need to be loaded when eagerly loading the | Aaron Patterson | 2012-06-14 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | framework | |||||
| * | | | | i suck, fixing error message | Aaron Patterson | 2012-06-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #6671 from mrbrdo/master | José Valim | 2012-06-14 | 6 | -18/+67 | |
| |\ \ \ \ | |_|/ / |/| | | | Bad Regexp exploits "fix" master branch | |||||
| | * | | | prevent users from unknowingly using bad regexps that can compromise ↵ | MrBrdo | 2012-06-14 | 6 | -18/+67 | |
| | | | | | | | | | | | | | | | | | security (http://homakov.blogspot.co.uk/2012/05/saferweb-injects-in-various-ruby.html) | |||||
| * | | | | Wrap up missing helper exceptions | Aaron Patterson | 2012-06-14 | 1 | -2/+10 | |
| |/ / / | | | | | | | | | | | | | | | | | | | The `path` method on missing helper errors is inconsistent with the implementation on LoadError in Ruby 2.0. Wrap up the missing helper exceptions so that the inconsistent behavior is mirrored in Ruby 2.0 (until we can figure out *why* it's inconsistent). | |||||
| * | | | removes item in the Active Record CHANGELOG | Xavier Noria | 2012-06-14 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | That change to update_attribute was considered to be too subtle and was reverted in 30ea923 just before Rails 3 shipped. Later we introduced update_column (Rails 3.1). | |||||
| * | | | using hax to fix tests on Ruby 2.0 | Aaron Patterson | 2012-06-13 | 1 | -1/+6 | |
| | | | | ||||||
| * | | | Fix build | Santiago Pastorino | 2012-06-13 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge pull request #6721 from homakov/patch-2 | Santiago Pastorino | 2012-06-13 | 1 | -3/+0 | |
| |\ \ \ | | | | | | | | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w... | |||||
| | * | | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o ↵ | Egor Homakov | 2012-06-13 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | them [nil] turns into [] and that is quite innocent. generated SQL - `IN (NULL)` compact! did all the job. | |||||
| * | | | | ActionController::Caching depends on RackDelegation and ↵ | Santiago Pastorino | 2012-06-13 | 2 | -0/+35 | |
| |/ / / | | | | | | | | | | AbstractController::Callbacks | |||||
| * | | | raise the same exception in order to keep path info | Aaron Patterson | 2012-06-12 | 2 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | Ruby 2.0.0 implements LoadError#path, but newly raised load errors will not contain the path information. Replace the error message, copy blame, and rereaise the same exception object | |||||
| * | | | fixing security email address | Aaron Patterson | 2012-06-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master-sec' | Aaron Patterson | 2012-06-12 | 2 | -2/+8 | |
| |\ \ \ | | | | | | | | | | | | | | | | | * master-sec: Array parameters should not contain nil values. | |||||
| | * | | | Array parameters should not contain nil values. | Aaron Patterson | 2012-06-12 | 2 | -2/+8 | |
| | | | | | ||||||
| * | | | | Merge pull request #6715 from arunagw/add_asserts | Rafael Mendonça França | 2012-06-12 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Need a assert here in tests | |||||
| | * | | | | Need a assert here in tests | Arun Agrawal | 2012-06-12 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #6676 from aurelian/master | Rafael Mendonça França | 2012-06-12 | 2 | -1/+5 | |
| |\ \ \ \ | | | | | | | | | | | Don't assign the attributes if the list is empty | |||||
| | * | | | | Don't assign the attributes if the list is empty. | Aurelian Oancea | 2012-06-08 | 2 | -1/+5 | |
| | | | | | | ||||||
| * | | | | | content_type is already a Mime::Type object | Santiago Pastorino | 2012-06-12 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | This consider_all_requests_local doesn't make sense | Santiago Pastorino | 2012-06-12 | 2 | -21/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This middleware is only for Public Exceptions. This follows bd8c0b8a | |||||
| * | | | | | Merge pull request #6444 from kennyj/create_extenstion_hstore | Rafael Mendonça França | 2012-06-12 | 2 | -0/+12 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Create hstore extension when building PostgreSQL databases (for rails contributor). | |||||
| | * | | | | Create hstore extension when building PostgreSQL databases. | kennyj | 2012-06-12 | 2 | -0/+12 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #6711 from takkanm/fix-warning-LoadError-path-method | José Valim | 2012-06-12 | 1 | -5/+7 | |
| |\ \ \ \ | | | | | | | | | | | fix method redefined warning in Ruby2.0 | |||||
| | * | | | | fix method redefined warning in Ruby2.0 | Mitsutaka Mimura | 2012-06-12 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | Ruby2.0 already has LoadError#path. | |||||
| * | | | | | Stop relying on mutable structures in the FileUpdateChecker | José Valim | 2012-06-12 | 2 | -35/+7 | |
| |/ / / / | ||||||
| * | / / | Remove warnings and unused code | Rafael Mendonça França | 2012-06-11 | 2 | -7/+2 | |
| | |/ / |/| | | ||||||
| * | | | No need to cache table metadata in advance now that #6683 was merged. | Rafael Mendonça França | 2012-06-11 | 2 | -16/+0 | |
| | | | | ||||||
| * | | | Return proper format on exceptions | Santiago Pastorino | 2012-06-11 | 3 | -14/+81 | |
| | | | | ||||||
| * | | | Merge pull request #6492 from pmahoney/fair-connection-pool2 | Rafael Mendonça França | 2012-06-11 | 5 | -38/+286 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fair connection pool2 Conflicts: activerecord/test/cases/associations/eager_test.rb | |||||
| | * | | | Make connection pool fair with respect to waiting threads. | Patrick Mahoney | 2012-05-25 | 4 | -38/+282 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core of this fix is a threadsafe, fair Queue class. It is very similar to Queue in stdlib except that it supports waiting with a timeout. The issue this solves is that if several threads are contending for database connections, an unfair queue makes is possible that a thread will timeout even while other threads successfully acquire and release connections. A fair queue means the thread that has been waiting the longest will get the next available connection. This includes a few test fixes to avoid test ordering issues that cropped up during development of this patch. | |||||
| | * | | | Cache metadata in advance to avoid extra sql statements while testing. | Yasuo Honda | 2012-05-25 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | Reason: If metadata is not cached extra sql statements will be executed, which causes failures tests with assert_queries(). | |||||
| * | | | | Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125 | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6 | |||||
| | * | | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6 | Akira Matsuda | 2012-06-12 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #6708 from ↵ | José Valim | 2012-06-11 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted | |||||
| | * | | | | | ignore .gitignore'd files in rake test:uncomitted | Akira Matsuda | 2012-06-12 | 1 | -1/+1 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9 | |||||
| | * | | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9 | Akira Matsuda | 2012-06-12 | 1 | -1/+1 | |
| | |/ / / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |