github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,320 Commits 34 Branches 105 Tags
30db3a82f653e7d7215e41bec525932cf5b17de1
Commit Graph

22320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
30db3a82f6 Merge pull request #430 from dlee/methodoverride 
Logs should show overridden method; Issue 426
 2011-05-08 03:33:22 -07:00
José Valim
ad129639c7 Fix failing xml mini test. 2011-05-08 12:25:02 +02:00
José Valim
67c3469e6f Merge pull request #452 from jrom/runner-r-alias 
Add alias `r` for rails runner
 2011-05-08 01:13:08 -07:00
Jordi Romero
bfff5eac77 Add alias r for rails runner 2011-05-07 20:12:34 -07:00
Santiago Pastorino
70f9558d0e Merge pull request #449 from msgehard/rename_duplicate_test_methods 
Rename duplicate tests
 2011-05-07 16:14:37 -07:00
Mike Gehard
0bc91a4cf7 Rename duplicate tests. There is now one failing test that was failing before the rename but was never getting run. 2011-05-07 17:02:42 -06:00
Aaron Patterson
820b6f3da0 Merge pull request #442 from jasonnoble/namespace_fixtures 
Namespace Fixtures in ActiveRecord
 2011-05-07 15:33:51 -07:00
Jason Noble
e5c18ff2cc Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s)) 2011-05-07 16:15:09 -06:00
José Valim
0ef978d1d2 Revert "Merge pull request #275 from pk-amooma/master" 
Several AP tests fail after this change.

This reverts commit aaf01cd537, reversing
changes made to 9cc18c52fa.
 2011-05-07 23:45:15 +02:00
José Valim
0a1ba4eab0 Always expand */* 2011-05-07 23:43:44 +02:00
mathieuravaux
fadd1fa3d3 Fixes ticket #6379. Improved the handling of Accept headers containing */*. 
`lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*"
resulted in [:js, "*/*"] formats instead of [:js, :html].

Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-05-07 23:35:52 +02:00
José Valim
803548c46b xml_mini_test.rb now runs. 2011-05-07 22:45:06 +02:00
Jason Noble
7db2ef47a1 Namespace Fixtures in ActiveRecord 
[Fixes #439]
 2011-05-07 14:20:51 -06:00
Aaron Patterson
3a82ff9555 Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbers 
ordinalize negative numbers patch
 2011-05-07 12:31:20 -07:00
Jason
3880ab0d7c ordinalize negative numbers patch 
Applied patch by Amir Manji
  https://github.com/rails/rails/issues/437#issuecomment-1116045

Signed-off-by: Jason <jasonmichaelroth@gmail.com>
 2011-05-07 13:21:00 -06:00
Xavier Noria
7ec3f33e3a Merge pull request #435 from vijaydev/master 
Update README template to include info about app/assets
 2011-05-07 09:36:46 -07:00
Vijay Dev
9d6f28d234 update readme to reflect app/assets 2011-05-07 21:40:34 +05:30
José Valim
45aec460d4 Merge pull request #434 from arunagw/changelog_doc 
Updated changelog for jdbc* adapters template.
 2011-05-07 09:01:36 -07:00
Arun Agrawal
4addc99d19 Updated change log for jdbc* adapters template. 2011-05-07 21:24:21 +05:30
José Valim
ba23bf43f2 Class.new.name returns an empty string on 1.8 2011-05-07 17:46:44 +02:00
José Valim
5d6c8d5e9d Revert "Revert the merge because tests did not pass." 
This reverts commit 886818d2ba.
 2011-05-07 17:33:40 +02:00
José Valim
00a1152fa7 Update CHANGELOG. 2011-05-07 15:32:11 +02:00
José Valim
7d7a353f77 Merge pull request #343 from asanghi/ampm 
Allow AM/PM format in datetime selectors
 2011-05-07 06:31:18 -07:00
José Valim
f77cd7c7b6 Merge pull request #286 from jasoncodes/marshal_subsec 
Fix marshal round-tripping of fractional seconds (Time#subsec).
 2011-05-07 04:39:50 -07:00
José Valim
c444b0f67b ADdd missing requires (thanks to @arunagw) 2011-05-07 13:35:21 +02:00
José Valim
0e886fe10e Merge pull request #280 from jballanc/frozen-string-strip-tags 
Stripping tags from a frozen string
 2011-05-07 03:44:19 -07:00
José Valim
aaf01cd537 Merge pull request #275 from pk-amooma/master 
properly escape "'" to "'" for XML
 2011-05-07 03:41:26 -07:00
José Valim
9cc18c52fa Merge pull request #263 from CvX/master 
Corrected dbconsole usage message
 2011-05-07 03:34:28 -07:00
José Valim
b011a7a938 Merge remote branch 'rolftimmermans/desc_tracker' 2011-05-07 12:26:45 +02:00
José Valim
a761d77902 Merge pull request #248 from bigfix/enumerable_as_json 
Enumerable should pass encoding options to children in #as_json/#to_json
 2011-05-07 03:19:56 -07:00
David Lee
17a91a6ef9 Logs should show overridden method; Issue 426 2011-05-07 03:04:26 -07:00
José Valim
a6ef255ff5 Merge pull request #349 from bradley178/master 
Hash.from_xml chokes on empty CDATA
 2011-05-07 02:58:16 -07:00
José Valim
c515f64f72 Use .ref instead of .to_sym. 2011-05-07 02:22:17 +02:00
Xavier Noria
fa8623b52e adds comments clarifying the role of SharedGeneratorTests 2011-05-07 00:11:50 +02:00
José Valim
8bbf47ad5f Merge pull request #424 from gnufied/master 
Fixes around_filter from observer, github issue#329
 2011-05-06 14:50:14 -07:00
Hemant Kumar
20c35bca5a fix yield not working from around filter of observers, fixes Github#329 2011-05-07 03:03:41 +05:30
José Valim
886818d2ba Revert the merge because tests did not pass. 
Revert "Merge pull request #423 from richardiux/master"

This reverts commit b8f08c4ea7, reversing
changes made to fd9df1b1dd.
 2011-05-06 23:17:43 +02:00
José Valim
b8f08c4ea7 Merge pull request #423 from richardiux/master 
Identity Map caching bug
 2011-05-06 14:07:24 -07:00
José Valim
fd9df1b1dd Merge pull request #419 from smartinez87/avail_action 
better styling on #available_action? docs
 2011-05-06 10:26:13 -07:00
Sebastian Martinez
9899f53184 better styling on #available_action? docs 2011-05-06 14:23:25 -03:00
Aaron Patterson
dd752a5de9 Merge pull request #418 from myronmarston/am_observer_doc_updates 
Add documentation for new observer enable/disable feature.
 2011-05-06 10:20:04 -07:00
Richard Millan
fc2823a85c Adding base method symbolized_sti_name to activerecord base to be used on identity map. Identity map now considers the inheritance when creating the caching keys 2011-05-06 10:05:43 -07:00
Myron Marston
99363dcf60 Add documentation for new observer enable/disable feature. 2011-05-06 10:00:14 -07:00
José Valim
9c2c25c1a1 Revert to old semantics, use available_action? instead of action_method?. 2011-05-06 18:44:18 +02:00
José Valim
6acb858d06 Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit 
Always flush logger at exit
 2011-05-06 09:43:57 -07:00
Jason Rudolph
cb2d811ebb Add test to verify production rake tasks flush logger on exit 2011-05-06 12:25:11 -04:00
Jason Rudolph
59982acd63 Always flush logger at exit 
Prior to this change, running code via script/runner would demonstrate
different logging behavior than running the same code via a rake task.
In production mode the script/runner approach would always flush the
logger, but the rake-based approach would not automatically flush the
logger. This discrepancy violates the principle of least surprise, and
it could lead to the loss of important production logging data.

This change removes special-case code in the "runner" command, and
replaces it with a general solution to ensure that the logger gets
flushed at exit. This solution works for "runner", "console", "server",
rake tasks, and any other process that loads the Rails environment.
 2011-05-06 12:21:21 -04:00
José Valim
cae68d221c Merge pull request #414 from asanghi/lh5796 
config.generators.orm = false when skipping active record. LightHouse #5796
 2011-05-06 08:35:57 -07:00
Aditya Sanghi
a8cfceca55 be consistent 2011-05-06 21:02:20 +05:30
Aditya Sanghi
cdf1842caa review fixes 2011-05-06 20:59:15 +05:30