Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #11045 from rajars2576/fixing_action_view | Xavier Noria | 2013-06-21 | 1 | -3/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix the path of action view from actionpack/lib/action_view => actionvie... | |||||
| * | | | | fix the path of action view from actionpack/lib/action_view => ↵ | Rajarshi Das | 2013-06-21 | 1 | -3/+3 | |
|/ / / / | | | | | | | | | | | | | actionview/lib/action_view | |||||
* | | | | Merge pull request #11039 from robin850/patch-2 | Xavier Noria | 2013-06-21 | 1 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | Backport #11033 to master | |||||
| * | | | Update the feedback instructions [ci skip] | Robin Dupret | 2013-06-21 | 1 | -5/+5 | |
|/ / / | | | | | | | | | | | | | | | | Since docrails as moved from lifo/docrails to rails/docrails we have to ask for commit rights or submit patches directly to the rails repository | |||||
* | | | Don't remove trailing slash from PATH_INFO for mounted apps | Piotr Sarnacki | 2013-06-21 | 3 | -1/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when app was mounted as following: class Foo def call(env) [200, {}, [env['PATH_INFO']]] end end RackMountRailsBug::Application.routes.draw do mount RackTest.new => "/foo" end trailing slash was removed from PATH_INFO. For example requesting GET /foo/bar/ on routes defined above would result in a response containing "/foo/bar" instead of "/foo/bar/". This commit fixes the issue. (closes #3215) | |||||
* | | | Merge pull request #11014 from ↵ | Piotr Sarnacki | 2013-06-20 | 3 | -0/+33 | |
|\ \ \ | | | | | | | | | | | | | | | | | senny/10936_inspect_does_not_crash_without_connection `inspect` for AR model classes does not initiate a new connection. | |||||
| * | | | `inspect` for AR model classes does not initiate a new connection. | Yves Senn | 2013-06-20 | 3 | -0/+33 | |
| | | | | ||||||
* | | | | Merge pull request #11030 from ↵ | Piotr Sarnacki | 2013-06-20 | 3 | -5/+29 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mjtko/fix/backtrace-silencer-noise-with-multiple-silencers Fix BacktraceSilencer#noise when multiple silencers are configured | |||||
| * | | | | Fix BacktraceCleaner#noise for multiple silencers. | Mark J. Titorenko | 2013-06-20 | 3 | -5/+29 | |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation of BacktraceSilencer#noise did not work correctly if more than one silencer was configured -- specifically, it would only return noise which was matched by all silencers. The new implementation is such that anything that has been matched by silencers is removed from the backtrace using Array#- (array difference), ie. we now return all elements within a backtrace that have been matched by any silencer (and are thus removed by #silence). Fixes #11030. | |||||
* | | | | Merge pull request #11032 from strzalek/extract-actionview | Piotr Sarnacki | 2013-06-20 | 337 | -66/+1040 | |
|\ \ \ \ | |/ / / |/| | | | Extract ActionView to separate directory | |||||
| * | | | Check if malformed fixture exists first | Łukasz Strzałkowski | 2013-06-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Now if somebody by mistake will remove malformed files test will raise error. | |||||
| * | | | Restore mistakenly removed malformed file fixtures | Łukasz Strzałkowski | 2013-06-20 | 5 | -0/+5 | |
| | | | | ||||||
| * | | | Rename AP to AV in info about running tests | Łukasz Strzałkowski | 2013-06-20 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Bump up version, fix module name | Łukasz Strzałkowski | 2013-06-20 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Adjust changelog for AV & AP | Łukasz Strzałkowski | 2013-06-20 | 2 | -36/+44 | |
| | | | | ||||||
| * | | | Remove heading from AV's CHANGELOG | Łukasz Strzałkowski | 2013-06-20 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | Change from 'actionpack' to 'actionview' for locales path | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix isolated tests on AV | Łukasz Strzałkowski | 2013-06-20 | 1 | -3/+5 | |
| | | | | ||||||
| * | | | Add ActionView to CI | Łukasz Strzałkowski | 2013-06-20 | 2 | -2/+3 | |
| | | | | ||||||
| * | | | Template test were moved to AV | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove require to AP stuff that left | Łukasz Strzałkowski | 2013-06-20 | 2 | -2/+0 | |
| | | | | ||||||
| * | | | Fix digestor tests | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Remove digestor fixtures from AP | Łukasz Strzałkowski | 2013-06-20 | 12 | -25/+0 | |
| | | | | | | | | | | | | | | | | They were moved to actionview/ and are not used in actionpack | |||||
| * | | | Copy company test fixture to AV (fixes failing test) | Łukasz Strzałkowski | 2013-06-20 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Remove unneeded test fixtures in AV | Piotr Sarnacki | 2013-06-20 | 237 | -558/+0 | |
| | | | | ||||||
| * | | | Add actionpack as actionview's development dependency | Piotr Sarnacki | 2013-06-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | ActionView still relies on ActionPack in some of the tests. | |||||
| * | | | Remove unneeded files | Piotr Sarnacki | 2013-06-20 | 7 | -88/+0 | |
| | | | | ||||||
| * | | | Move template tests from actionpack to actionview | Piotr Sarnacki | 2013-06-20 | 351 | -15/+1514 | |
| | | | | ||||||
| * | | | ActionView version should be 4.1.0 | Piotr Sarnacki | 2013-06-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Move actionpack/lib/action_view* into actionview/lib | Piotr Sarnacki | 2013-06-20 | 97 | -95/+71 | |
| | | | | ||||||
| * | | | Add bare actionview gem to the root directory | Piotr Sarnacki | 2013-06-20 | 9 | -2/+147 | |
|/ / / | | | | | | | | | | | | | This commit creates structure for Action View gem and is first of a series of commits extracting Action View from Action Pack. | |||||
* | | | Merge pull request #11020 from fredwu/master-activemodel-inclusion-chain-fix-iii | Rafael Mendonça França | 2013-06-20 | 2 | -6/+16 | |
|\ \ \ | | | | | | | | | ActiveModel::Model inclusion chain backward compatibility | |||||
| * | | | ActiveModel::Model inclusion chain backward compatibility | Fred Wu | 2013-06-20 | 2 | -6/+16 | |
| | | | | ||||||
* | | | | Merge pull request #11024 from pdorrell/master | Xavier Noria | 2013-06-20 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Fix 3 typos in Configuration guide | |||||
| * | | | fix "will be ran" and "has began" typos in configuration guide | Philip Dorrell | 2013-06-20 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #11017 from stormsilver/patch-1 | Yves Senn | 2013-06-19 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | Fix name of nested attributes option include_id | |||||
| * | | Fix name of nested attributes option include_id | Eric Hankins | 2013-06-19 | 1 | -2/+2 | |
|/ / | | | | | The option to disable including a hidden ID field on a `fields_for` nested association was incorrectly documented as `hidden_field_id` instead of `include_id` | |||||
* | | add forgotten CHANGELOG entry for #10884. | Yves Senn | 2013-06-19 | 1 | -0/+5 | |
| | | ||||||
* | | Merge pull request #10884 from dmarkow/pg_fix_default_quotes | Yves Senn | 2013-06-19 | 2 | -1/+26 | |
|\ \ | | | | | | | Handle single quotes in PostgreSQL default column values | |||||
| * | | Handle single quotes in PostgreSQL default column values | Dylan Markow | 2013-06-19 | 2 | -1/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL escapes single quotes by using an additional single quote. When Rails queries the column information, PostgreSQL returns the default values with the escaped single quotes. #extract_value_from_default now converts these to one single quote each. Fixes #10881. | |||||
* | | | Fixes AciveModel::Model with no ancestors, fixes #11004 | Fred Wu | 2013-06-19 | 2 | -3/+24 | |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@plataformatec.com.br> | |||||
* | | | Revert "Merge pull request #10566 from neerajdotname/10509d" | Jon Leighton | 2013-06-19 | 3 | -25/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16, reversing changes made to 353a398bee68c5ea99d76ac7601de0a5fef6f4a5. Conflicts: activerecord/CHANGELOG.md Reason: the build broke | |||||
* | | | add documentation for `ActiveSupport::Testing::SetupAndTeardown`. | Yves Senn | 2013-06-19 | 1 | -2/+17 | |
| | | | ||||||
* | | | Merge pull request #10991 from neerajdotname/10982 | Yves Senn | 2013-06-19 | 3 | -1/+19 | |
|\ \ \ | | | | | | | | | log the sql that is actually sent to the database | |||||
| * | | | log the sql that is actually sent to the database | Neeraj Singh | 2013-06-19 | 3 | -1/+19 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I have a query that produces sql `WHERE "users"."name" = 'a b'` then in the log all the whitespace is being squeezed. So the sql that is printed in the log is `WHERE "users"."name" = 'a b'`. This can be confusing. This commit fixes it by ensuring that whitespace is not squeezed. fixes #10982 | |||||
* | | | better documentation for `AS::Testing::Declarative#test`. [ci skip] | Yves Senn | 2013-06-19 | 1 | -3/+6 | |
| | | | ||||||
* | | | Merge pull request #11007 from ugisozols/remove_duplicate_letter | Yves Senn | 2013-06-19 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Remove duplicate letter 'a'. [ci skip] | |||||
| * | | | Remove duplicate letter 'a'. [ci skip] | Uģis Ozols | 2013-06-19 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #11002 from fredwu/master-activemodel-inclusion-chain-fix | José Valim | 2013-06-18 | 2 | -0/+14 | |
|\ \ \ | | | | | | | | | Fixed ActiveModel::Model's inclusion chain | |||||
| * | | | Fixed ActiveModel::Model's inclusion chain | Fred Wu | 2013-06-19 | 2 | -0/+14 | |
|/ / / |