aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1187 from thedarkone/polymorphic-class-fixSantiago Pastorino2011-05-212-1/+12
|\ | | | | Handle polymorphic_type NOT NULL columns
| * Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-212-1/+12
| |
* | Uglifier works properly now with 0.5.4David Heinemeier Hansson2011-05-211-1/+1
| |
* | Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is releasedDavid Heinemeier Hansson2011-05-211-1/+1
| |
* | Add support for passing mass assignment roles to dynamic finders. Closes #1170.Andrew White2011-05-212-2/+50
|/
* Merge pull request #1182 from prakashmurthy/patch-1José Valim2011-05-211-1/+1
|\ | | | | Enhanced test for duplicable in active_support/core_ext/object/duplicable.rb
| * Check for Module.new.dup as well in ↵Prakash Murthy2011-05-211-1/+1
| | | | | | | | https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/duplicable.rb
* | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-218-8/+0
|\ \ | |/ |/| Not updating rubyforge for new versions.
| * Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-208-8/+0
| | | | | | | | not useful.
* | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-216-9/+16
|\ \ | | | | | | Singularize individual table name
| * | AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
| | |
| * | Refactoring test_has_many_with_pluralize_table_names_false testGuillermo Iguaran2011-05-202-4/+2
| | |
| * | Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-202-2/+11
| | |
* | | Merge pull request #1179 from castlerock/activesupport_testJosé Valim2011-05-211-1/+1
|\ \ \ | | | | | | | | fixed failing tests of ActiveSupport for deprecation test
| * | | fixed failing tests of ActiveSupport for deprecation testRaghunadh2011-05-211-1/+1
|/ / /
* | | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
| | |
* | | Merge pull request #1178 from joshk/ruby19_warningJosé Valim2011-05-201-3/+3
|\ \ \ | | | | | | | | Corrected a minor ruby19 variable name reuse warning
| * | | corrected a minor ruby19 variable name reuse warningJosh Kalderimis2011-05-211-3/+3
|/ / /
* | | Merge pull request #1177 from joshk/ruby19_warningsJosé Valim2011-05-202-2/+0
|\ \ \ | | | | | | | | Fixed some ruby 19 warnings
| * | | fixed some ruby 19 warnings, including circular requires and variable name reuseJosh Kalderimis2011-05-212-2/+0
| | | |
* | | | Merge pull request #1175 from joshk/active_resource_correctionJosé Valim2011-05-201-4/+16
|\ \ \ \ | | | | | | | | | | attr_accessor_with_default removed from ActiveResource
| * | | | attr_accessor_with_default is deprecated, so lets not use it in ActiveResourceJosh Kalderimis2011-05-211-4/+16
| |/ / /
* | | | Temporarily ship with ContentLength middleware.José Valim2011-05-207-15/+47
| | | |
* | | | Merge pull request #1169 from senny/specify_a_custom_active_model_nameJosé Valim2011-05-202-3/+41
|\ \ \ \ | | | | | | | | | | Specify the name to be used for ActiveModel::Name fixes #1168
| * | | | Specify the name to be used for ActiveModel::Name fixes #1168Yves Senn2011-05-202-3/+41
|/ / / / | | | | | | | | | | | | This patch allows to specify the name of your models independent of the class name.
* | | | Merge pull request #1157 from smartinez87/extra_whitespacesXavier Noria2011-05-201-3/+3
|\ \ \ \ | |_|_|/ |/| | | Remove extra white spaces.
| * | | Remove extra white spaces.Sebastian Martinez2011-05-191-3/+3
| | | |
* | | | Merge pull request #1161 from guilleiguaran/each_syntax_in_activerecordXavier Noria2011-05-204-4/+4
|\ \ \ \ | |_|_|/ |/| | | Syntax cleanup: for in => each on ActiveRecord
| * | | for => each in model migration templateGuillermo Iguaran2011-05-201-1/+1
| | | |
| * | | Syntax cleanup: for in => eachGuillermo Iguaran2011-05-193-3/+3
| |/ /
* / / Use sprockets prepend_path if its availableJoshua Peek2011-05-191-3/+9
|/ /
* | Implement proxy_owner, proxy_target and proxy_reflection methods on ↵Jon Leighton2011-05-193-5/+42
| | | | | | | | CollectionProxy with deprecations. Fixes #1148.
* | Merge pull request #1153 from arunagw/sprockets_updateSantiago Pastorino2011-05-191-1/+1
|\ \ | | | | | | Sprockets version update.
| * | Sprockets version update.Arun Agrawal2011-05-191-1/+1
|/ /
* | Use Rack::ContentLength.José Valim2011-05-192-5/+8
| |
* | Merge pull request #1097 from kirillrdy/masterMichael Koziarski2011-05-191-1/+1
|\ \ | | | | | | Improved "treat 0000-00-00 00:00:00 as nil Date"
| * | Year 0 should fall to nil only if month and day are also 0Kirill Radzikhovskyy2011-05-171-1/+1
| | |
* | | Merge pull request #1118 from amatsuda/pp_consoleMichael Koziarski2011-05-191-0/+1
|\ \ \ | | | | | | | | always enable `pp` on the Rails console
| * | | always enable `pp` on the Rails consoleAkira Matsuda2011-05-181-0/+1
| | | |
* | | | Merge pull request #1151 from joshk/wrap_params_options_changeJosé Valim2011-05-193-26/+26
|\ \ \ \ | | | | | | | | | | renamed the wrap_parameters :only and :except options to :include and :ex
| * | | | renamed the wrap_parameters :only and :except options to :include and ↵Josh Kalderimis2011-05-193-26/+26
| | |_|/ | |/| | | | | | | | | | :exclude to make it consistent with controller filters
* | | | Merge pull request #1150 from stevenbristol/masterJoshua Peek2011-05-192-7/+11
|\ \ \ \ | |/ / / |/| | | The cookie jar does not to_s cookie names (keys)
| * | | adding teststeve2011-05-191-4/+8
| | | |
| * | | fixing sym and string cookie name, two cookies to browser bug.steve2011-05-191-3/+3
|/ / /
* | | Merge pull request #1137 from guilleiguaran/each_syntax_in_activemodelJosé Valim2011-05-191-3/+1
|\ \ \ | | | | | | | | Prefer 'each' instead of 'for in'
| * | | Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
| | | |
* | | | Merge pull request #1136 from arunagw/actionmailer_readmeJosé Valim2011-05-194-13/+13
|\ \ \ \ | | | | | | | | | | Actionmailer readme
| * | | | Example Usage updated for actionpack and actionmailer.Arun Agrawal2011-05-194-13/+13
| | | | |
* | | | | Merge pull request #1135 from arunagw/for_to_eachJosé Valim2011-05-191-3/+3
|\| | | | | |/ / / |/| | | README updated for for => each
| * | | README updated for for => eachArun Agrawal2011-05-191-3/+3
|/ / /