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
23,963 Commits 34 Branches 105 Tags
b8a4e9fc6d4b7020d1fdeaa39e935330c5dadccd
Commit Graph

23963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
b8a4e9fc6d Merge pull request #2160 from joshk/patch-5 
Changed the year of a date used in a test which fails when using 1.8.7
 2011-07-19 14:11:03 -07:00
Josh Kalderimis
322393f8cb Changed the year of a date used in a test which fails when using 1.8.7 on a 32bit machine (ArgumentError: time out of range) 2011-07-19 13:52:32 -07:00
Santiago Pastorino
37418e5468 Merge pull request #2155 from vijaydev/changelogs 
Adding changelog entry for submit helper change which removed object_name_id generation
 2011-07-19 12:20:36 -07:00
Santiago Pastorino
ee6be604c6 Merge pull request #2154 from vijaydev/better_map 
Avoid Symbol#to_proc
 2011-07-19 12:18:46 -07:00
Vijay Dev
d275a98446 add entry for submit helper change removing object_name_id 2011-07-20 00:39:23 +05:30
Vijay Dev
02cbaf0593 avoid Symbol#to_proc 2011-07-20 00:28:51 +05:30
Santiago Pastorino
30289c7683 Merge pull request #2148 from norman/master 
Explicitly require Active Support dependencies (master)
 2011-07-19 06:38:20 -07:00
Norman Clarke
9db2d10b11 Explicitly require Active Support dependencies 
This fixes errors when using Active Record outside of Rails. In Rails,
these files are required by other classes that are always loaded, so
this error does not happen.

Without core_ext/module/delegation, a NoMethodError is raised because
`delegate` remains undefined.

Without core_ext/class/attribute_acessors, an ArgumentError is raised because
`delegate` does not receive a value for its :to option.
 2011-07-19 09:56:02 -03:00
Santiago Pastorino
73efb68dc9 Merge pull request #2139 from mcmire/issue_2078_master 
Fix for #2078 (against master)
 2011-07-18 17:27:21 -07:00
Xavier Noria
aaff90ac7f Merge pull request #2141 from joshk/master 
Config files to get Rails on Travis-CI
 2011-07-18 14:34:18 -07:00
Elliot Winkler
0e1d617b8b ActiveRecord: Fix eager loading so that giving a blank order clause generates valid SQL 2011-07-18 14:56:37 -06:00
José Valim
b475f74da5 Merge pull request #2133 from jstorimer/ensure-status-codes-are-logged-properly 
Ensure that status codes are logged properly
 2011-07-18 11:05:37 -07:00
Jesse Storimer
ac81af40c0 Ensure that status codes are logged properly 
Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
so that status codes rendered from rescue_from blocks are logged
properly.
 2011-07-18 13:42:07 -04:00
Santiago Pastorino
8efc0f1f34 Merge pull request #2116 from guilleiguaran/fix-environment-generator-action 
Fix Rails::Generators::Actions#environment when env is passed
 2011-07-18 10:00:08 -07:00
Guillermo Iguaran
fcdcc87a08 Fix Rails::Generators::Actions#environment when env is passed. Closes #2110 2011-07-18 10:43:25 -05:00
José Valim
da144894e9 Merge pull request #195 from bigfix/active_model_include_serialization 
ActiveModel support for the :include serialization option
 2011-07-18 06:50:43 -07:00
José Valim
44e83ac341 Merge pull request #2075 from lawrencepit/match_attribute_method 
Optimization of ActiveModel's match_attribute_method?
 2011-07-18 06:46:31 -07:00
Jon Leighton
50941ec07c Merge pull request #2128 from sikachu/master-dynamic_finder 
Raise an ArgumentError if user passing less number of argument in the dynamic finder
 2011-07-18 01:24:33 -07:00
Aaron Patterson
1e452f1840 make tzinfo a development dependency 2011-07-18 14:28:14 +09:00
Prem Sichanugrist
4443905169 Refactor test case to use anonymous class - Thank you @tenderlove 2011-07-18 00:37:06 -04:00
Santiago Pastorino
adc7097dc0 Merge pull request #2124 from arunagw/render_partial_invalid_check_fix 
Checking with to_s. As regexp fail with 1.8.7
 2011-07-17 20:14:12 -07:00
Jon Leighton
fcbde454f6 Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. 2011-07-18 00:22:26 +01:00
Prem Sichanugrist
1ccca1b9cb Refactor the code a bit to reduce the duplication 2011-07-17 18:53:15 -04:00
Prem Sichanugrist
6e6994994d Raise an ArgumentError if user passing less number of argument in the dynamic finder 
The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.)

So if you were doing this and expecting the second argument to be nil:

    User.find_by_username_and_group("sikachu")

You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:

    User.find_by_username_and_group("sikachu", nil)
 2011-07-17 18:44:03 -04:00
Arun Agrawal
d4f4626940 Checking with to_s. As regexp fail with 1.8.7 2011-07-18 01:27:38 +05:30
Santiago Pastorino
e9bd83402e Merge pull request #2046 from sikachu/master-test_fix 
Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
 2011-07-17 12:48:49 -07:00
Prem Sichanugrist
edfb81d668 Fix a wrong assertion on url_helper_test, and refactor html_safe test to be in its method 2011-07-17 15:34:01 -04:00
Santiago Pastorino
7669c33c74 Merge pull request #2018 from bhus/render_partial_invalid_check 
Render partial invalid check
 2011-07-17 12:28:03 -07:00
Jon Leighton
ac97e25235 Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again. 
This reverts commit e4479b2f1b.
 2011-07-17 19:55:05 +01:00
John Firebaugh
4860143ee4 ActiveModel support for the :include serialization option 
This commit moves support for the :include serialization option for
serializing associated objects out of ActiveRecord in into ActiveModel.
The following methods support the :include option:

  * serializable_hash
  * to_json
  * to_xml

Instances must respond to methods named by the values of the :includes
array (or keys of the :includes hash). If an association method returns
an object that is_a?(Enumerable) (which AR has_many associations do), it
is assumed to be a collection association, and its elements must respond
to :serializable_hash. Otherwise it must respond to :serializable_hash
itself.

While here, fix #858, XmlSerializer should not singularize already
singular association names.
 2011-07-17 11:34:07 -07:00
John Firebaugh
1723a7a6c6 Move to_xml tests to xml_serialization_test.rb 
One duplicate was eliminated: test_to_xml_including_methods/
test_methods_are_called_on_object.
 2011-07-17 11:34:07 -07:00
John Firebaugh
0933b6d1ba We already have the record; no need to retrieve it again 2011-07-17 11:34:06 -07:00
John Firebaugh
cbf924ef08 Replace map+compact with select 2011-07-17 11:34:06 -07:00
John Firebaugh
2a9a10f5e3 Add a test 2011-07-17 11:34:06 -07:00
John Firebaugh
da4e1faf6f serializable_hash(:only => [], :methods => [:foo]) should work 2011-07-17 11:34:06 -07:00
Santiago Pastorino
2f00854d22 Merge pull request #2118 from arunagw/fix_plugin_gen_test 
As we are adding db folder in it. Required in test also.
 2011-07-17 10:04:53 -07:00
Josh Kalderimis
e6f0c24bc3 This fixes an issue when bundling to a local path (eg. /vendor/bundle). 
If you bundle to a local path bundler is not included in it, so
calling "gem 'bundler'" will fail.
 2011-07-17 15:21:19 +02:00
Arun Agrawal
24d67cc9df As we are adding db folder in it. Required in test also. 2011-07-17 18:39:33 +05:30
Lawrence Pit
52a096275a Made attribute_method_matchers_cache private + doc 2011-07-17 14:51:34 +10:00
Xavier Noria
0aec2e7191 indeed, if we are going to remove everything in public/assets on assets:clean, just do that 2011-07-17 00:44:00 +02:00
Xavier Noria
53f6acd252 if we are cleaning all files, we are cleaning all gz files 2011-07-17 00:35:21 +02:00
Santiago Pastorino
296b1eef67 Merge pull request #2082 from htanata/rake_routes_formatting 
Better formatting of rake routes (issue #1991)
 2011-07-16 11:22:58 -07:00
Hendy Tanata
7b619f1d7b Improve formatting of route to Rack application in rake routes. 
This route:

    match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/

is shown as:

    /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/}
 2011-07-17 00:49:48 +08:00
Santiago Pastorino
e98d747705 Merge pull request #2108 from loz/master 
Adds gem helper rake tasks to engines generator
 2011-07-16 08:43:51 -07:00
Jonathan Lozinski
8b080b3831 Added gem helper to rake task for engines, as per pull request from 3-1-stable, #2103 2011-07-16 16:06:44 +01:00
Santiago Pastorino
3e06ec8944 Fix the output a bit 2011-07-16 09:54:03 -03:00
José Valim
94d8e6bdf8 Merge pull request #2101 from loz/master 
Added db to gemspec so migrations are packaged
 2011-07-16 04:02:12 -07:00
Lawrence Pit
c3dd4c653d Issue #2075 Optimization of ActiveModel's match_attribute_method? 2011-07-16 16:40:11 +10:00
Jonathan Lozinski
06c9dd1906 Added db to gemspec files so migrations are correctly packaged 2011-07-16 06:48:54 +01:00
Santiago Pastorino
c2b62addfe Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog 
Fix wildcard route code example in changelog
 2011-07-15 14:24:43 -07:00