aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'master' into mapperAaron Patterson2014-05-2922-73/+148
| |\ \ \ \ \
| * | | | | | "controllers" should be a valid path nameAaron Patterson2014-05-292-1/+11
| * | | | | | controllers with slash names are also not supported, so we can reuse the messageAaron Patterson2014-05-281-6/+2
| * | | | | | only validate controllersAaron Patterson2014-05-281-15/+17
| * | | | | | golf down a bitAaron Patterson2014-05-281-8/+4
| * | | | | | only error handling between controller and action is the sameAaron Patterson2014-05-281-18/+16
| * | | | | | add a test for controllers without colonsAaron Patterson2014-05-281-0/+10
| * | | | | | move nil check to a method that yields to a block if the value is not nilAaron Patterson2014-05-281-17/+16
| * | | | | | translate action / controller to the desired objectAaron Patterson2014-05-281-12/+11
| * | | | | | only one nil check on the action variableAaron Patterson2014-05-281-10/+8
| * | | | | | change to case / when on typesAaron Patterson2014-05-281-8/+7
| * | | | | | only do one nil check against the controllerAaron Patterson2014-05-281-9/+9
| * | | | | | extract controller and action parsing to a methodAaron Patterson2014-05-281-19/+26
| * | | | | | we don't need the call to presence. that is my present, to you!Aaron Patterson2014-05-281-1/+1
| * | | | | | swtich to returning early if to responds to callAaron Patterson2014-05-281-35/+32
| * | | | | | return early if we have a valid controller nameAaron Patterson2014-05-281-5/+5
| * | | | | | trade 2 is_a? checks for a nil checkAaron Patterson2014-05-281-2/+4
| * | | | | | invert logic to remove nil? and exclude? checks (use ruby rather than AS when...Aaron Patterson2014-05-281-6/+6
| * | | | | | fewer blank? callsAaron Patterson2014-05-281-4/+4
| * | | | | | reduce action.blank? callsAaron Patterson2014-05-281-4/+6
| * | | | | | reduce blank? checksAaron Patterson2014-05-281-4/+9
| * | | | | | extract controller checks to methodsAaron Patterson2014-05-281-19/+26
| * | | | | | set defaults at the top so we can avoid the ||= testAaron Patterson2014-05-281-6/+9
| * | | | | | add a test for existing mapper functionalityAaron Patterson2014-05-281-0/+12
* | | | | | | Merge pull request #15414 from akshay-vishnoi/doc_changesRafael Mendonça França2014-05-291-2/+3
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Include ActiveModel::Model in a class instead of inheritingAkshay Vishnoi2014-05-301-2/+3
|/ / / / / / /
* | | | | | | Generated engines don't include bin/rake, fixes #15409 [ci skip]Zachary Scott2014-05-291-5/+5
* | | | | | | Merge pull request #15413 from sgrif/sg-i-wish-i-couldRafael Mendonça França2014-05-291-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Don't reference comments that do not existSean Griffin2014-05-291-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-writeRafael Mendonça França2014-05-296-86/+47
|\ \ \ \ \ \ \
| * | | | | | | Move `type_cast_for_write` behavior over to the serialized type objectSean Griffin2014-05-296-86/+47
|/ / / / / / /
* | | | | | | Add missing period from 4b802bc [ci skip]Zachary Scott2014-05-291-1/+1
* | | | | | | Merge pull request #15411 from nathany/patch-1Zachary Scott2014-05-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken link in Rails 3.0 release_notesNathan Youngman2014-05-291-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #15398 from sgrif/sg-serialized-typesYves Senn2014-05-2910-50/+52
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Refactor serialized types to be partially defined as custom propertiesSean Griffin2014-05-2910-50/+52
* | | | | | | Update url to rake docs [ci skip]Zachary Scott2014-05-292-2/+2
* | | | | | | Merge pull request #15407 from ShunsukeAida/correct_model_name_exampleArthur Nogueira Neves2014-05-292-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Name#model_name doesn't return a String objectShunsukeAida2014-05-302-2/+2
|/ / / / / /
* | | | | | Merge pull request #15406 from sgrif/sg-column-type-overrideRafael Mendonça França2014-05-293-1/+51
|\ \ \ \ \ \
| * | | | | | Result sets never override a model's column typeSean Griffin2014-05-293-1/+51
|/ / / / / /
* | | | | | Merge pull request #15061 from tgxworld/remove_unnecessary_includeMatthew Draper2014-05-293-8/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary include for integration tests.Guo Xiang Tan2014-05-113-8/+0
* | | | | | | Merge pull request #15397 from sgrif/sg-column-classYves Senn2014-05-295-6/+15
|\ \ \ \ \ \ \
| * | | | | | | Ensure we always use instances of the adapter specific column classSean Griffin2014-05-285-6/+15
* | | | | | | | Merge pull request #15403 from JuanitoFatas/doc/pg-guide-noteRobin Dupret2014-05-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Make last note show up in postgresql guide.Juanito Fatas2014-05-291-1/+1
|/ / / / / / / /
* | | | | | | | Add missing `:param` option from the docs for Mapper#match [ci skip]Zachary Scott2014-05-291-0/+6
* | | | | | | | Add @senny's changed from #14741, including code font for `resources`Zachary Scott2014-05-291-1/+4
* | | | | | | | Merge branch 'master' of github.com:zackperdue/rails into zackperdue-masterZachary Scott2014-05-291-0/+19
|\ \ \ \ \ \ \ \