aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #18206 from kamipo/dump_default_nil_for_postgresql_uuid_pr...Yves Senn2014-12-263-1/+11
|\ \ | |/ |/|
| * Dump the default `nil` for PostgreSQL UUID primary key.Ryuta Kamizono2014-12-263-1/+11
|/
* Merge pull request #18205 from vipulnsward/fix-railties-warningGuillermo Iguaran2014-12-261-3/+3
|\
| * - Changed `paths` to `routing_paths` to avoid warning `possible reference to ...Vipul A M2014-12-261-3/+3
|/
* Merge pull request #18197 from vipulnsward/fix-ar-2-2warningGuillermo Iguaran2014-12-261-2/+2
|\
| * - Changed `target` to `target_reflection` to avoid warning `possible referenc...Vipul A M2014-12-251-2/+2
* | Merge pull request #18203 from kyledecot/ruby-2.2Guillermo Iguaran2014-12-261-1/+1
|\ \
| * | targeting 2.2Kyle Decot2014-12-251-1/+1
* | | Merge pull request #18204 from chocoby/remove-double-spaceGuillermo Iguaran2014-12-261-1/+1
|\ \ \
| * | | Remove unnecessary double spaceKenta Okamoto2014-12-261-1/+1
| |/ /
* | | Merge pull request #18194 from claudiob/remove-action-controller-model-namingGuillermo Iguaran2014-12-252-16/+0
|\ \ \ | |/ / |/| |
| * | Remove ActionController::ModelNamingclaudiob2014-12-252-16/+0
* | | Add example to get Errored test to pass in Testing guide [ci skip]Zachary Scott2014-12-251-0/+13
| |/ |/|
* | Merge pull request #18196 from PavelPenkov/rails_env_instead_of_railsMatthew Draper2014-12-261-1/+1
|\ \ | |/ |/|
| * Check for Rails.env instead of RailsPavel Penkov2014-12-251-1/+1
|/
* Merge pull request #18185 from ivalkeen/add_missing_guidesZachary Scott2014-12-241-0/+5
|\
| * List the Active Support Instrumentation guide in the index (as WIP)Ivan Tkalin2014-12-241-0/+5
* | Correct grammar to fix #18182 [ci skip]Zachary Scott2014-12-241-1/+1
* | Merge pull request #18190 from ef718/masterZachary Scott2014-12-241-1/+1
|\ \
| * | Update grammar [ci skip]Elaine Fang2014-12-241-1/+1
| |/
* / Fix a few typos [ci skip]Robin Dupret2014-12-242-5/+6
|/
* Merge pull request #18183 from danbernier/masterArun Agrawal2014-12-241-1/+1
|\
| * Fix bug in ActionMailer guide.Dan Bernier2014-12-241-1/+1
|/
* Merge pull request #18107 from mkdynamic/add-reply-to-mail-toSean Griffin2014-12-242-4/+5
|\
| * Add support for Reply-To field in mail_to helperMark Dodwell2014-12-202-4/+5
* | Merge pull request #18180 from vipulnsward/remove-unnecessary-name-passingSean Griffin2014-12-241-4/+4
|\ \
| * | - Removed unused parameter to cookie serialize method and fixed usage of the ...Vipul A M2014-12-241-4/+4
|/ /
* | Merge pull request #18159 from M7/docs-active_record-update_query_method_docs...Sean Griffin2014-12-231-1/+1
|\ \
| * | Clarify that query methods have a custom definition of whether a numeric valu...Michael D.W. Prendergast2014-12-231-2/+2
| * | Clarify that the word present refers to Object#present?. [ci skip]Michael D.W. Prendergast2014-12-231-36/+2
| * | Update Active Record's attribute query methods documentation to describe its ...Michael D.W. Prendergast2014-12-221-2/+36
* | | removes superfluous regexp groupXavier Noria2014-12-231-1/+1
* | | warn about reading guides in GitHubXavier Noria2014-12-2348-0/+96
* | | third test to warn against reading guides in GitHubXavier Noria2014-12-232-2/+2
* | | second test to warn against reading guides in GitHubXavier Noria2014-12-232-3/+2
* | | proof of concept, need to check in GitHubXavier Noria2014-12-232-0/+4
* | | Merge pull request #18174 from bogdan/cleanup_has_many_though_association_countSean Griffin2014-12-231-15/+0
|\ \ \
| * | | Remove unneeded special case to calculate size for has_many :throughBogdan Gusiev2014-12-231-15/+0
* | | | Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secretsSean Griffin2014-12-231-1/+15
|\ \ \ \
| * | | | Rails::Application#secrets should be documented.Guo Xiang Tan2014-12-241-1/+15
* | | | | Don't treat `nil` as changed in serialized typesSean Griffin2014-12-232-1/+9
* | | | | Refactor a common class to reduce the duplication for `references`Sean Griffin2014-12-232-59/+86
* | | | | Fix syntax warningSean Griffin2014-12-231-1/+1
* | | | | Merge pull request #18167 from al2o3cr/checkin_connection_leakSean Griffin2014-12-232-4/+36
|\ \ \ \ \
| * | | | | Fix connection leak when a thread checks in additional connections.Matt Jones2014-12-232-4/+36
| | |_|/ / | |/| | |
* | | | | Merge pull request #18166 from merongivian/search_field_refactorSean Griffin2014-12-232-10/+12
|\ \ \ \ \
| * | | | | Remove block from superJose AƱasco2014-12-232-10/+12
* | | | | | Changelog for 99a6f9e60ea55924b44f894a16f8de0162cf2702Sean Griffin2014-12-231-0/+6
* | | | | | Merge pull request #18145 from georgemillo/patch-2Sean Griffin2014-12-231-0/+3
|\ \ \ \ \ \
| * | | | | | Add information about "allow_destroy" requiring an ID. [ci skip]George Millo2014-12-231-0/+3