aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes Dependency bug in Active SupportTomohiko Himura2013-05-023-0/+3
* Remove not used module from initializable testCarlos Antonio da Silva2013-05-011-9/+1
* Fix failures in AS with minitest 4.7.4Carlos Antonio da Silva2013-05-011-0/+3
* Merge pull request #10396 from tkhr/extract-test-code-from-base_test.rbCarlos Antonio da Silva2013-05-012-73/+82
|\
| * Extract tests code out from AR's base_test.rb to integration_test.rbTakehiro Adachi2013-05-022-73/+82
* | Merge pull request #10408 from patricksrobertson/convert_activemodel_to_new_h...Rafael Mendonça França2013-05-0143-349/+351
|\ \
| * | Convert ActiveModel to 1.9 hash syntax.Patrick Robertson2013-05-0143-349/+351
|/ /
* | Merge pull request #7839 from chancancode/handle_aliased_attributes_in_ar_rel...Aaron Patterson2013-05-017-9/+70
|\ \
| * | Handle aliased attributes in ActiveRecord::Relation.Godfrey Chan2013-05-017-9/+70
* | | Improve docs for postgresql with uuid primary keys [ci skip]Carlos Antonio da Silva2013-05-012-9/+7
* | | Merge pull request #10407 from NARKOZ/encoding-constantCarlos Antonio da Silva2013-05-011-1/+1
|\ \ \ | |/ / |/| |
| * | use constant for encodingNihad Abbasov2013-05-021-1/+1
* | | Merge pull request #10404 from chadmoone/fix-pg-uuid-defaultRafael Mendonça França2013-05-012-1/+61
|\ \ \
| * | | allow override of uuid_generate_v4() default by passing default: nilChad Moone2013-05-012-1/+61
| |/ /
* | | Merge pull request #10405 from rubys/410-betaGuillermo Iguaran2013-05-011-2/+2
|\ \ \ | |/ / |/| |
| * | Make railties version match RAILS_VERSIONSam Ruby2013-05-011-2/+2
|/ /
* | Merge pull request #10394 from BMorearty/remove-varargs-from-inGuillermo Iguaran2013-05-013-31/+10
|\ \
| * | Revert the guide after removing varargs from `in?`.Brian Morearty2013-05-011-2/+1
| * | Revert "Object#in? also accepts multiple parameters"Brian Morearty2013-05-012-29/+9
* | | Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
| |/ |/|
* | Revert "Consistent use of code syntax formatting for boolean values"Xavier Noria2013-05-011-7/+7
* | Revert "Correct formatting for remaining booleans"Xavier Noria2013-05-011-21/+21
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-0136-380/+334
|\
| * copy edits [ci skip]Vijay Dev2013-05-012-2/+2
| * routes.rb should teach how to use concernsThiago Pinto2013-05-011-0/+7
| * Correct formatting for remaining booleansJonathan Roes2013-04-301-21/+21
| * more naming fixes.Yves Senn2013-04-305-7/+12
| * it's Active Record not ActiveRecordYves Senn2013-04-308-8/+13
| * Consistent use of code syntax formatting for boolean valuesJonathan Roes2013-04-301-7/+7
| * Move 2 images to getting_started folder. All other images in getting started ...Richard Owen2013-04-283-2/+2
| * New rails welcome screenRichard Owen2013-04-281-0/+0
| * Use instance variables in redirect_toMikhail Dieterle2013-04-281-4/+4
| * Add changes based on recommendations in Issue #9793Nick Borromeo2013-04-231-173/+65
| |\
| | * Remove calls to action: and make use of named routes for consistency.Nick Borromeo2013-04-231-106/+35
| | * Move use of named routes to beggining of the guideNick Borromeo2013-04-231-67/+30
| |/
| * Added missing ')' on routing_filter linkhughkelsey2013-04-231-1/+1
| * Update assets_pipeline with config.assets.precompile locationZoltan Debre2013-04-231-2/+2
| * Remove superfluous `self.` in Action Mailer mail method documetationAlexey Vakhov2013-04-231-3/+3
| * Cosmetic fixes in AM::Base docs. Missed spaces in OpenSSL constants enumerati...Alexey Vakhov2013-04-231-2/+2
| * Mention that Dynamic finders have been deprecated in Rails 4Jonathan Roes2013-04-231-0/+2
| * Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-04-221-3/+3
| |\
| | * Make AM readme example more consistentAlexey Vakhov2013-04-221-3/+3
| * | Added instructions of latest bundler install + modified the on: :save option ...aditya-kapoor2013-04-222-2/+5
| |/
| * corrected a typo related to on: :save option in validationsaditya-kapoor2013-04-221-1/+1
| * corrected a line related to on: :save option in validationsaditya-kapoor2013-04-221-0/+2
| * fixes typo in testing guideFlorian Thomas2013-04-211-1/+1
| * Updates list of assertions in testing guideFlorian Thomas2013-04-211-12/+19
| * Refer to 37signals blog post for alternativeJonathan Roes2013-04-211-2/+2
| * Make guide description more conciseFiona Tay2013-04-211-1/+1
| * There are now 6 request methods including PATCHJonathan Roes2013-04-191-1/+1