aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21456 from rodzyn/clean_requiresRafael Mendonça França2015-09-017-13/+2
|\
| * Remove not used requiresMarcin Olichwirowicz2015-09-017-13/+2
* | Respect scale of the column in the Decimal typeRafael Mendonça França2015-09-013-1/+36
* | Add windows version of nokogiriRafael Mendonça França2015-09-011-0/+4
* | Merge pull request #21455 from bkeepers/railties-licenseRafael Mendonça França2015-09-011-1/+1
|\ \
| * | Include MIT-LICENSE in railties gemBrandon Keepers2015-09-011-1/+1
|/ /
* | Merge pull request #21454 from claudiob/fix-failing-tests-on-guidesRafael Mendonça França2015-09-013-0/+9
|\ \
| * | Fix: make Travis CI happy about guides againclaudiob2015-09-013-0/+9
|/ /
* | Merge pull request #21453 from claudiob/minimum-sprockets-2Kasper Timm Hansen2015-09-012-2/+2
|\ \ | |/ |/|
| * Require sprockets-rails >= 2claudiob2015-09-012-2/+2
|/
* Merge pull request #21450 from amitsuroliya/minor_typoKasper Timm Hansen2015-09-011-1/+1
|\
| * typo fix [ci skip]amitkumarsuroliya2015-09-011-1/+1
* | Merge pull request #21447 from aditya-kapoor/add-missing-test-amKasper Timm Hansen2015-09-011-0/+14
|\ \ | |/ |/|
| * Add missing test for #17351Aditya Kapoor2015-09-011-0/+14
* | Merge pull request #21444 from etdev/fix-readme-typo-itsKasper Timm Hansen2015-09-011-1/+1
|\ \
| * | Fix typo in readme fileEric Turner2015-09-011-1/+1
* | | Fix bug where cookies mutated by request were not persistedeileencodes2015-09-013-0/+17
| |/ |/|
* | Fix failure introduced by #17351 due to the new mocks implementationCarlos Antonio da Silva2015-09-011-1/+1
* | Merge pull request #21443 from jashank/fix-17351Carlos Antonio da Silva2015-09-011-1/+1
|\ \
| * | Fix syntax error introduced by #17351.Jashank Jeremy2015-09-011-1/+1
| |/
* / Add master branch to github gems to be able to use local clonesCarlos Antonio da Silva2015-09-012-8/+12
|/
* Merge pull request #17351 from akshat-sharma/masterRafael Mendonça França2015-09-013-4/+30
|\
| * Add case_sensitive option for confirmation validationAkshat Sharma2015-09-013-4/+32
* | Merge pull request #21416 from lsylvester/cache-helper-with-relationRafael Mendonça França2015-09-013-3/+24
|\ \
| * | Fix calling cache helper with a relationLachlan Sylvester2015-08-283-3/+24
* | | Merge pull request #19788 from cmdrclueless/actionpack_http_url_ipv6Rafael Mendonça França2015-09-012-1/+46
|\ \ \
| * | | Fix broken IPv6 addresses handlingBrian Weaver2015-04-162-1/+46
* | | | Merge pull request #21298 from rodzyn/remove_dead_codeRafael Mendonça França2015-09-011-4/+0
|\ \ \ \
| * | | | Remove dead codeMarcin Olichwirowicz2015-08-191-4/+0
* | | | | No need to get the exception variableRafael Mendonça França2015-09-011-6/+4
* | | | | Merge pull request #21318 from yahonda/pr21108Rafael Mendonça França2015-09-012-3/+7
|\ \ \ \ \
| * | | | | Support MySQL 5.7.8 which enables show_compatibility_56=offYasuo Honda2015-08-212-3/+7
* | | | | | No need CHANGELOG entry for #21421 [ci skip]Rafael Mendonça França2015-09-011-6/+0
* | | | | | Merge pull request #21421 from leighhalliday/array_inq_toggle_string_symbolRafael Mendonça França2015-09-013-11/+22
|\ \ \ \ \ \
| * | | | | | ArrayInquirer to correctly find symbols or stringsLeigh Halliday2015-08-283-11/+22
* | | | | | | Inline uneccessary frozen string constantSean Griffin2015-08-311-3/+1
* | | | | | | Merge pull request #21436 from claudiob/silence-callbacks-warningRafael Mendonça França2015-08-311-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Silence callback deprecation warning if testing AJclaudiob2015-08-311-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #21432 from yui-knk/fix/what_change_method_can_reverseSean Griffin2015-08-302-15/+34
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Update what methods `Migration#change` can reverseyui-knk2015-08-312-15/+34
* | | | | | | | Merge pull request #21433 from y-yagi/fix_typoKasper Timm Hansen2015-08-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix typo in method name [ci skip]yuuji.yaginuma2015-08-301-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #21429 from yui-knk/fix/revert_disable_extensionSean Griffin2015-08-302-1/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make revert of `disable_extension` to workyui-knk2015-08-302-1/+34
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-08-302-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Capitalize commentsyui-knk2015-08-291-1/+1
| * | | | | | | [ci skip] Fix file name generated by `rails generate`yui-knk2015-08-241-1/+1
* | | | | | | | add a method for getting the http auth saltAaron Patterson2015-08-292-2/+6
* | | | | | | | env to get_header conversionAaron Patterson2015-08-291-1/+1
* | | | | | | | fixes example for consistency [ci skip]Xavier Noria2015-08-291-3/+3