aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #11053 from yangchenyun/mine"José Valim2013-06-221-2/+0
* test-case to prevent regressions on `Association#build` with an Array.Yves Senn2013-06-221-0/+10
* Merge pull request #11053 from yangchenyun/mineYves Senn2013-06-221-0/+2
|\
| * add explicit AS dependencies for ActiveModel::NamingSteven Yang2013-06-221-0/+2
* | Merge pull request #10796 from neerajdotname/10669Jon Leighton2013-06-223-2/+19
|\ \
| * | flatten merged join_values before building the joinsNeeraj Singh2013-06-223-2/+19
|/ /
* | Merge pull request #11050 from robin850/remove-rails-test-mentionCarlos Antonio da Silva2013-06-211-2/+0
|\ \
| * | Remove code related to the rails test commandRobin Dupret2013-06-211-2/+0
* | | Merge pull request #11051 from neerajdotname/10509fJon Leighton2013-06-213-1/+25
|\ \ \ | |/ / |/| |
| * | do not load all child records for inverse caseNeeraj Singh2013-06-213-1/+25
|/ /
* | Merge pull request #11049 from neerajdotname/no-need-of-large-numberJon Leighton2013-06-211-1/+5
|\ \
| * | fix bad test by making number that fits for integerNeeraj Singh2013-06-211-1/+5
* | | Merge pull request #10537 from jetthoughts/10428_bug_with_config_assets_preco...Guillermo Iguaran2013-06-211-0/+23
|\ \ \
| * | | #10428: Added tests for config.assets.precompilePaul Nikitochkin2013-06-211-0/+23
* | | | Merge pull request #11040 from satococoa/fix-create_join_table-documentCarlos Antonio da Silva2013-06-212-4/+4
|\ \ \ \
| * | | | Fix documents for create_join_tableSatoshi Ebisawa2013-06-212-4/+4
* | | | | Merge pull request #11043 from arunagw/gemcutter_to_rubygemsCarlos Antonio da Silva2013-06-218-8/+8
|\ \ \ \ \
| * | | | | Saying gemcutter => rubygems [ci skip]Arun Agrawal2013-06-218-8/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #11045 from rajars2576/fixing_action_viewXavier Noria2013-06-211-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix the path of action view from actionpack/lib/action_view => actionview/lib...Rajarshi Das2013-06-211-3/+3
|/ / / /
* | | | Merge pull request #11039 from robin850/patch-2Xavier Noria2013-06-211-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Update the feedback instructions [ci skip]Robin Dupret2013-06-211-5/+5
|/ / /
* | | Don't remove trailing slash from PATH_INFO for mounted appsPiotr Sarnacki2013-06-213-1/+16
* | | Merge pull request #11014 from senny/10936_inspect_does_not_crash_without_con...Piotr Sarnacki2013-06-203-0/+33
|\ \ \
| * | | `inspect` for AR model classes does not initiate a new connection.Yves Senn2013-06-203-0/+33
* | | | Merge pull request #11030 from mjtko/fix/backtrace-silencer-noise-with-multip...Piotr Sarnacki2013-06-203-5/+29
|\ \ \ \
| * | | | Fix BacktraceCleaner#noise for multiple silencers.Mark J. Titorenko2013-06-203-5/+29
| | |/ / | |/| |
* | | | Merge pull request #11032 from strzalek/extract-actionviewPiotr Sarnacki2013-06-20337-66/+1040
|\ \ \ \ | |/ / / |/| | |
| * | | Check if malformed fixture exists firstŁukasz Strzałkowski2013-06-201-0/+1
| * | | 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
| * | | 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
| * | | 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
|/ / /
* | | Merge pull request #11020 from fredwu/master-activemodel-inclusion-chain-fix-iiiRafael Mendonça França2013-06-202-6/+16
|\ \ \