aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes minor ruby 1.8 inconsistencyAndrew Radev2011-05-272-1/+28
| | | | | ActiveSupport::OrderedHash did not behave identically to Hash when given a block with a splat.
* adding a test for #1322Aaron Patterson2011-05-261-0/+15
|
* Merge pull request #1323 from fx/association_primary_keyJon Leighton2011-05-262-1/+11
|\ | | | | use association_primary_key in AssociationScope#add_constraints
| * added assertion for non-standard primary_key on models used in the ↵Marian Rudzynski2011-05-261-0/+3
| | | | | | | | primary_key test
| * use association_primary_key in AssociationScope#add_constraintsMarian Rudzynski2011-05-262-1/+8
| |
* | Merge pull request #1318 from TheEmpty/masterJon Leighton2011-05-263-19/+0
|\ \ | | | | | | Resolve issue #534
| * | Removes a now needless test - via GithubMohammad Typaldos2011-05-261-8/+0
| | |
| * | Removes the restriction on primary key when joining in a habtm && test that ↵Mohammad El-Abid2011-05-263-15/+4
| | | | | | | | | | | | it was properly removed
* | | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-267-39/+57
|\ \ \ | | | | | | | | MassAssignmentSecurity: add ability to specify your own sanitizer
| * | | MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
* | | | Merge pull request #1344 from jmileham/serialization_includesJosé Valim2011-05-262-6/+11
|\ \ \ \ | | | | | | | | | | AR Serialization shouldn't fall back to base opts for includes
| * | | | Don't merge base opts into includes when serializing ARsJohn Mileham2011-05-261-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb
| * | | | Failing test - JSON serialization shouldn't merge base opts into include opts.John Mileham2011-05-261-0/+9
|/ / / /
* | | | Merge pull request #1328 from flippingbits/cleanup_engine_generatorJosé Valim2011-05-263-3/+3
|\ \ \ \ | | | | | | | | | | Cleanup engine generator
| * | | | Use global namespace RailsStefan Sprenger2011-05-262-2/+2
| | | | |
| * | | | Use plugin name consistentlyStefan Sprenger2011-05-261-1/+1
|/ / / /
* | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-262-1/+7
|\ \ \ \ | |_|_|/ |/| | | Don't raise an exception if the format isn't recognized
| * | | don't raise an exception if the format isn't recognizeddmathieu2011-05-262-1/+7
| | | | | | | | | | | | | | | | Fixed while traveling to heuruko
* | | | Merge pull request #1315 from ardavis/masterJosé Valim2011-05-252-2/+2
|\ \ \ \ | |_|_|/ |/| | | Removed unnecessary space in application.rb
| * | | Added a space to the comment_if helper for formatting purposesAndrew Davis2011-05-251-1/+1
| | | |
| * | | Accidentally added extra IDE files, removed them.Andrew Davis2011-05-258-342/+0
| | | |
| * | | Removed unnecessary space in application.rb for formattingAndrew Davis2011-05-259-1/+343
| | | |
* | | | Merge pull request #1316 from guilleiguaran/railties-changelogAaron Patterson2011-05-251-0/+7
|\ \ \ \ | |/ / / |/| | | Updating Railties changelog
| * | | Updating Railties changelogGuillermo Iguaran2011-05-251-0/+7
|/ / /
* | | Merge pull request #1312 from joshk/remove_active_support_deprecationsJosé Valim2011-05-2515-648/+3
|\ \ \ | | | | | | | | Removed deprecated methods and related tests from ActiveSupport
| * | | Removed deprecated methods and related tests from ActiveSupportJosh Kalderimis2011-05-2515-648/+3
|/ / /
* | | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ \ | | | | | | | | action_view/template/handler.rb has been removed
| * | | action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
| | | |
* | | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-2512-162/+4
|\| | |
| * | | Merge pull request #1285 from joshk/remove_active_record_deprecationsAaron Patterson2011-05-2512-162/+4
| |\ \ \ | | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord
| | * | | removed deprecated methods, and related tests, from ActiveRecordJosh Kalderimis2011-05-2512-162/+4
| | | | |
* | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2594-363/+408
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | | | Typo; changed 'Febuary' to 'February'Lee Reilly2011-05-251-1/+1
| | | | |
| * | | | Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'Lee Reilly2011-05-251-3/+3
| | | | |
| * | | | Typo; changed 'enviroment' to 'environment'Lee Reilly2011-05-251-1/+1
| | | | |
| * | | | prefer validates :x in place of validates_x_ofVijay Dev2011-05-261-25/+25
| | | | |
| * | | | fixed minor errorsVijay Dev2011-05-261-3/+4
| | | | |
| * | | | changes validates_format & numericality to newer syntaxVijay Dev2011-05-251-6/+6
| | | | |
| * | | | changes validates_inclusion & exclusion to newer syntaxVijay Dev2011-05-251-7/+7
| | | | |
| * | | | changes validates_length_of to newer syntaxVijay Dev2011-05-251-17/+14
| | | | |
| * | | | changes validates_confirmation_of to newer syntaxVijay Dev2011-05-251-4/+4
| | | | |
| * | | | changes validates_acceptance_of to newer syntaxVijay Dev2011-05-251-2/+2
| | | | |
| * | | | changes validates_uniqueness_of to newer syntaxVijay Dev2011-05-251-4/+4
| | | | |
| * | | | changes validates_presence_of to newer syntaxVijay Dev2011-05-251-9/+8
| | | | |
| * | | | fix incorrect textile syntaxVijay Dev2011-05-251-2/+2
| | | | |
| * | | | Replace old wording about http requestsJeff Cohen2011-05-251-4/+4
| | | | |
| * | | | update language env variable nameVijay Dev2011-05-251-2/+2
| | | | |
| * | | | Adds outline draft#1 for the Asset Pipeline, please comment if you have ↵Mohammad El-Abid2011-05-251-0/+29
| | | | | | | | | | | | | | | | | | | | thoughts about it!
| * | | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵Karunakar (Ruby)2011-05-245-5/+5
| | | | | | | | | | | | | | | | | | | | files
| * | | | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 06:52:51 +0000