aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix the path of action view from actionpack/lib/action_view => ↵Rajarshi Das2013-06-211-3/+3
| | | | actionview/lib/action_view
* Merge pull request #11039 from robin850/patch-2Xavier Noria2013-06-211-5/+5
|\ | | | | Backport #11033 to master
| * Update the feedback instructions [ci skip]Robin Dupret2013-06-211-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 appsPiotr Sarnacki2013-06-213-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 Sarnacki2013-06-203-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 Senn2013-06-203-0/+33
| |
* | Merge pull request #11030 from ↵Piotr Sarnacki2013-06-203-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. Titorenko2013-06-203-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-actionviewPiotr Sarnacki2013-06-20337-66/+1040
|\ \ \ | |/ / |/| | Extract ActionView to separate directory
| * | Check if malformed fixture exists firstŁukasz Strzałkowski2013-06-201-0/+1
| | | | | | | | | | | | Now if somebody by mistake will remove malformed files test will raise error.
| * | Restore mistakenly removed malformed file fixturesŁukasz Strzałkowski2013-06-205-0/+5
| | |
| * | Rename AP to AV in info about running testsŁukasz Strzałkowski2013-06-201-2/+2
| | |
| * | Bump up version, fix module nameŁukasz Strzałkowski2013-06-201-4/+4
| | |
| * | Adjust changelog for AV & APŁukasz Strzałkowski2013-06-202-36/+44
| | |
| * | Remove heading from AV's CHANGELOGŁukasz Strzałkowski2013-06-201-2/+0
| | |
| * | Change from 'actionpack' to 'actionview' for locales pathŁukasz Strzałkowski2013-06-201-1/+1
| | |
| * | Fix isolated tests on AVŁukasz Strzałkowski2013-06-201-3/+5
| | |
| * | Add ActionView to CIŁukasz Strzałkowski2013-06-202-2/+3
| | |
| * | Template test were moved to AVŁukasz Strzałkowski2013-06-201-1/+1
| | |
| * | Remove require to AP stuff that leftŁukasz Strzałkowski2013-06-202-2/+0
| | |
| * | Fix digestor testsŁukasz Strzałkowski2013-06-201-1/+2
| | |
| * | Remove digestor fixtures from APŁukasz Strzałkowski2013-06-2012-25/+0
| | | | | | | | | | | | They were moved to actionview/ and are not used in actionpack
| * | Copy company test fixture to AV (fixes failing test)Łukasz Strzałkowski2013-06-201-0/+9
| | |
| * | Remove unneeded test fixtures in AVPiotr Sarnacki2013-06-20237-558/+0
| | |
| * | Add actionpack as actionview's development dependencyPiotr Sarnacki2013-06-201-0/+2
| | | | | | | | | | | | ActionView still relies on ActionPack in some of the tests.
| * | Remove unneeded filesPiotr Sarnacki2013-06-207-88/+0
| | |
| * | Move template tests from actionpack to actionviewPiotr Sarnacki2013-06-20351-15/+1514
| | |
| * | ActionView version should be 4.1.0Piotr Sarnacki2013-06-201-1/+1
| | |
| * | Move actionpack/lib/action_view* into actionview/libPiotr Sarnacki2013-06-2097-95/+71
| | |
| * | Add bare actionview gem to the root directoryPiotr Sarnacki2013-06-209-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-iiiRafael Mendonça França2013-06-202-6/+16
|\ \ | | | | | | ActiveModel::Model inclusion chain backward compatibility
| * | ActiveModel::Model inclusion chain backward compatibilityFred Wu2013-06-202-6/+16
| | |
* | | Merge pull request #11024 from pdorrell/masterXavier Noria2013-06-201-3/+3
|\ \ \ | |/ / |/| | Fix 3 typos in Configuration guide
| * | fix "will be ran" and "has began" typos in configuration guidePhilip Dorrell2013-06-201-3/+3
|/ /
* | Merge pull request #11017 from stormsilver/patch-1Yves Senn2013-06-191-2/+2
|\ \ | |/ |/| Fix name of nested attributes option include_id
| * Fix name of nested attributes option include_idEric Hankins2013-06-191-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 Senn2013-06-191-0/+5
|
* Merge pull request #10884 from dmarkow/pg_fix_default_quotesYves Senn2013-06-192-1/+26
|\ | | | | Handle single quotes in PostgreSQL default column values
| * Handle single quotes in PostgreSQL default column valuesDylan Markow2013-06-192-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 #11004Fred Wu2013-06-192-3/+24
| | | | | | | | Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
* | Revert "Merge pull request #10566 from neerajdotname/10509d"Jon Leighton2013-06-193-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 Senn2013-06-191-2/+17
| |
* | Merge pull request #10991 from neerajdotname/10982Yves Senn2013-06-193-1/+19
|\ \ | | | | | | log the sql that is actually sent to the database
| * | log the sql that is actually sent to the databaseNeeraj Singh2013-06-193-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 Senn2013-06-191-3/+6
| |
* | Merge pull request #11007 from ugisozols/remove_duplicate_letterYves Senn2013-06-191-1/+1
|\ \ | | | | | | Remove duplicate letter 'a'. [ci skip]
| * | Remove duplicate letter 'a'. [ci skip]Uģis Ozols2013-06-191-1/+1
|/ /
* | Merge pull request #11002 from fredwu/master-activemodel-inclusion-chain-fixJosé Valim2013-06-182-0/+14
|\ \ | | | | | | Fixed ActiveModel::Model's inclusion chain
| * | Fixed ActiveModel::Model's inclusion chainFred Wu2013-06-192-0/+14
|/ /
* | Merge pull request #10566 from neerajdotname/10509dJon Leighton2013-06-183-1/+25
|\ \ | | | | | | do not load all child records for inverse case