aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | added assertion for non-standard primary_key on models used in the primary_ke...Marian Rudzynski2011-05-261-0/+3
| * | | | 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
|\ \ \ \ \
| * | | | | 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 i...Mohammad El-Abid2011-05-263-15/+4
* | | | | | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-267-39/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-39/+57
* | | | | | Merge pull request #1344 from jmileham/serialization_includesJosé Valim2011-05-262-6/+11
|\ \ \ \ \ \
| * | | | | | Don't merge base opts into includes when serializing ARsJohn Mileham2011-05-261-6/+2
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 recognizeddmathieu2011-05-262-1/+7
* | | | | | Merge pull request #1315 from ardavis/masterJosé Valim2011-05-252-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 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 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 ActiveSupportJosh Kalderimis2011-05-2515-648/+3
|/ / / / /
* | | | | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ \ \ \
| * | | | | 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 ActiveRecordJosh Kalderimis2011-05-2512-162/+4
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2594-363/+408
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 thoug...Mohammad El-Abid2011-05-251-0/+29
| * | | | | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme f...Karunakar (Ruby)2011-05-245-5/+5
| * | | | | | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| * | | | | | Removed extra white-spaces on config/environment/test.rb templateGuillermo Iguaran2011-05-231-2/+2
| * | | | | | Removing extra white-spaces on config/environment/development.rb templateGuillermo Iguaran2011-05-231-1/+1
| * | | | | | Update the MVC explanation in the main README.rdoc fileJeff Cohen2011-05-231-21/+26
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:57:58 +0000