aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19197 from teeceepee/improve_docsRafael Mendonça França2015-03-042-16/+16
|\
| * Fix spelling [ci skip]Yu Haidong2015-03-042-16/+16
|/
* add CHANGELOG entry for #19176. [ci skip]Yves Senn2015-03-041-0/+4
* Merge pull request #19195 from y-yagi/patch-1Xavier Noria2015-03-041-1/+1
|\
| * fix spelling, `ERb` -> `ERB` [ci skip]yuuji.yaginuma2015-03-041-1/+1
|/
* Merge pull request #19191 from tjschuck/cache_timestamp_format_guide_updateAaron Patterson2015-03-031-1/+1
|\
| * Update cache_timestamp_format default value in guidesT.J. Schuck2015-03-031-1/+1
* | Merge pull request #19194 from mrgilman/fix-spelling-errorEileen M. Uchitelle2015-03-031-1/+1
|\ \ | |/ |/|
| * Fix spelling error in has_secure_password documentation [ci skip]Melanie Gilman2015-03-031-1/+1
|/
* Merge pull request #18777 from yasyf/issue_15209Rafael Mendonça França2015-03-033-1/+24
|\
| * Take DST into account when locating TimeZone from Numeric.Yasyf Mohamedali2015-03-033-1/+24
* | Tiny documentation edits [ci skip]Robin Dupret2015-03-032-2/+2
* | Remove line wrapping from the benchmark/ips outputPiotr Szotkowski2015-03-031-4/+4
* | Merge pull request #18775 from yasyf/issue_5122Rafael Mendonça França2015-03-034-1/+25
|\ \ | |/ |/|
| * Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`.Yasyf Mohamedali2015-02-244-1/+25
* | Merge pull request #19176 from imajes/masterYves Senn2015-03-032-1/+17
|\ \
| * | Fixes reference for schema_format to AR::Base from AS::BaseJames Cox2015-03-032-1/+17
* | | Remove mention of long-gone initializer and configJeremy Kemper2015-03-031-2/+0
* | | Merge pull request #19186 from kamipo/remove_unused_lineCarlos Antonio da Silva2015-03-031-1/+0
|\ \ \
| * | | Remove unused lineRyuta Kamizono2015-03-031-1/+0
|/ / /
* | | Merge pull request #19171 from JuanitoFatas/doc/more-examplesSean Griffin2015-03-021-0/+16
|\ \ \
| * | | Add more documents for AR connection_adapters abstract schema_definitions. [c...Juanito Fatas2015-03-031-0/+16
* | | | Merge pull request #19147 from gsamokovarov/work-around-ruby-10695Eileen M. Uchitelle2015-03-023-3/+5
|\ \ \ \
| * | | | Work around for upstream Ruby bug #10685Genadi Samokovarov2015-03-013-3/+5
* | | | | Merge pull request #15806 from tgxworld/partition_routes_during_setupAaron Patterson2015-03-024-8/+39
|\ \ \ \ \
| * | | | | Partition routes during setup.Guo Xiang Tan2015-02-264-8/+39
* | | | | | Merge pull request #19181 from davydovanton/update-helper-docsZachary Scott2015-03-021-0/+4
|\ \ \ \ \ \
| * | | | | | [ci skip] Add documentation for Helpers#all_helpers_from_pathAnton Davydov2015-03-031-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Revert "delete unused method"Carlos Antonio da Silva2015-03-021-0/+4
* | | | | | Merge pull request #19177 from gregmolnar/fixturesRafael Mendonça França2015-03-022-6/+4
|\ \ \ \ \ \
| * | | | | | test reset_pk_sequence with multi connectionGreg Molnar2015-03-011-1/+1
| * | | | | | Use the correct connection for reset_pk_sequenceMontana Low2015-03-011-5/+3
* | | | | | | Revert "mutate the transaction object to reflect state"Aaron Patterson2015-03-023-37/+33
* | | | | | | be optimistic about missing route keysAaron Patterson2015-03-021-13/+15
* | | | | | | use arg size for parallel iterationAaron Patterson2015-03-021-1/+1
* | | | | | | ask the routes objects for its Rack env keyAaron Patterson2015-03-023-2/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #19174 from zoltankiss/remove_unneeded_commentRafael Mendonça França2015-03-021-1/+0
|\ \ \ \ \ \
| * | | | | | Remove unneeded comment. [ci skip]Zoltan Kiss2015-03-021-1/+0
* | | | | | | delete unused methodAaron Patterson2015-03-021-4/+0
* | | | | | | mutate the transaction object to reflect stateAaron Patterson2015-03-021-25/+21
* | | | | | | ask the txn for it's state, not a state objectAaron Patterson2015-03-023-8/+16
* | | | | | | change if! to unlessAaron Patterson2015-03-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #19173 from robin850/rbx-buildRafael Mendonça França2015-03-0212-9/+34
|\ \ \ \ \ \
| * | | | | | Skip the failing tests on Rubinius for nowRobin Dupret2015-03-024-0/+9
| * | | | | | Wrap inline rescue with or-equal callsRobin Dupret2015-03-021-1/+1
| * | | | | | Avoid Ruby versions check on RubiniusRobin Dupret2015-03-021-1/+1
| * | | | | | Test against the mail gem's edgeRobin Dupret2015-03-022-2/+9
| * | | | | | Add the platform-specific skip helpers to ActiveModelRobin Dupret2015-03-021-0/+9
| * | | | | | Avoid accurate assertions on error messagesRobin Dupret2015-03-022-3/+3
| * | | | | | Avoid parallelizing Action Pack's tests on RubiniusRobin Dupret2015-03-021-2/+2