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,298 Commits 34 Branches 105 Tags
00a1152fa79808dfa86a516fe150911297f7aa58
Commit Graph

22298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
José Valim
0e5adbceb7 Don't pluralize, camelize. 2011-05-06 17:00:59 +02:00
Aditya Sanghi
9b5c29038d default orm and test_framework to false; change application.rb template accordingly 2011-05-06 20:29:11 +05:30
José Valim
d42bb68430 More updates to ivars list. 2011-05-06 14:57:25 +02:00
José Valim
894bdbd53d Move variables to underscore format, update protected instance variables list. 2011-05-06 14:57:25 +02:00
Aditya Sanghi
75e1e2175d When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder 2011-05-06 18:04:20 +05:30
José Valim
be9857c21d Merge pull request #410 from asanghi/LH6074 
distance_of_time_in_words calculates wrong no of years
 2011-05-06 04:41:24 -07:00
Xavier Noria
29dbccff30 Merge pull request #396 from asanghi/lh_4346 
Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346
 2011-05-06 03:53:17 -07:00
Aditya Sanghi
65a9563209 strip space 2011-05-06 15:51:09 +05:30
Aditya Sanghi
ae7d0d816d Take leap years into account more seriously when calculating year distance [#6074 state:resolved] 2011-05-06 15:42:05 +05:30
José Valim
4c755f977c Merge pull request #408 from etdsoft/master 
Rails::Server outputs 'http://' even when running over SSL
 2011-05-06 02:22:06 -07:00
Daniel Martin
1f1989dee0 Take into account the Rack::Server :SSLEnable option when building the application's URL 2011-05-06 07:22:27 +01:00
José Valim
785ee65ddf Ensure params wrapper settings are not inherited and calculated each time. 2011-05-06 07:11:06 +02:00
José Valim
41a6d96c1b Update CHANGELOGs. 2011-05-06 05:53:58 +02:00
José Valim
7adfd02b3f Merge pull request #400 from arunagw/ruby_prof 
Adding ruby-prof gem for ruby platform only #jruby
 2011-05-05 20:30:29 -07:00
Jon Leighton
030e1d06ca Merge pull request #399 from ernie/join_conditions_on_join 
Add association join conditions to JOIN clause, not WHERE
 2011-05-05 13:23:15 -07:00
Ernie Miller
9b7cd75db3 Add a test for outer joins with conditions where value IS NULL 2011-05-05 14:34:48 -04:00
Aaron Patterson
f098c80947 Merge pull request #358 from baroquebobcat/fix_find_or_create_master 
Fix for lighthouse #6741
 2011-05-05 11:13:05 -07:00
Arun Agrawal
976a9d99b1 Grouped the ruby-prof into test. 2011-05-05 23:17:07 +05:30
Arun Agrawal
745c9f3736 Removing from duplicate places. Only in Ruby platform needed. 2011-05-05 22:46:23 +05:30
Vishnu Atrai
c62fcaa659 adding ruby-prof gem for ruby platform only #jruby 2011-05-05 22:21:38 +05:30
Ernie Miller
8d270a2abb Add join conditions to JOIN clause, not WHERE 2011-05-05 12:35:29 -04:00
Richard Millan
d53b406a76 Test: identity on inherited classes should behave the same when turned on or off 2011-05-05 07:28:51 -07:00