aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add docs for AS::TestCase::test_orderclaudiob2014-12-182-2/+17
* Merge pull request #18087 from georgemillo/patch-2Eileen M. Uchitelle2014-12-181-2/+2
|\
| * Spelling fix [ci skip]George Millo2014-12-181-2/+2
|/
* passed a spell checker, not bad [ci skip]Xavier Noria2014-12-181-1/+1
* adds another examle to the constants not missing gotcha [ci skip]Xavier Noria2014-12-181-0/+55
* Relax the UUID regexGodfrey Chan2014-12-182-12/+9
* Merge pull request #18081 from yui-knk/fix/capture_helperAbdelkader Boudih2014-12-181-1/+2
|\
| * [ci skip] Fix HTML format on commentyui-knk2014-12-181-1/+2
|/
* Fix typo in nodoc should be `:nodoc:` for RDoc to parse correctlyZachary Scott2014-12-171-1/+1
* Merge pull request #18076 from andreynering/guides-changelogZachary Scott2014-12-171-1/+1
|\
| * Fix name on changelog [ci skip]Andrey Nering2014-12-171-1/+1
|/
* Merge pull request #18063 from claudiob/remove-as-time-with-zone-sinceRafael Mendonça França2014-12-171-10/+1
|\
| * Replace AS::TimeWithZone#since with alias to +claudiob2014-12-161-10/+1
* | Merge pull request #18072 from exAspArk/thread_safe_gem_versionRafael Mendonça França2014-12-171-1/+1
|\ \
| * | use thread_safe gem version greater or equal to 0.3.4Evgeny Li2014-12-171-1/+1
* | | simpler example for the non-missing constants gotcha [ci skip]Xavier Noria2014-12-171-42/+39
|/ /
* | Merge pull request #18068 from kamipo/remove_unused_lineCarlos Antonio da Silva2014-12-171-1/+0
|\ \
| * | Remove unused lineRyuta Kamizono2014-12-171-1/+0
* | | Merge pull request #18069 from yui-knk/fix/guideRafael Mendonça França2014-12-171-3/+3
|\ \ \ | |/ / |/| |
| * | [ci skip] Change three backticks to just oneyui-knk2014-12-171-3/+3
|/ /
* | Merge pull request #18065 from y-yagi/fix_autoloading_guideXavier Noria2014-12-171-1/+1
|\ \ | |/ |/|
| * fix link in autoloading guide [ci skip]yuuji.yaginuma2014-12-171-1/+1
|/
* `update_column` take ruby-land input, not database-land inputSean Griffin2014-12-164-3/+27
* Merge pull request #17980 from gsamokovarov/rescuable-case-operatorRafael Mendonça França2014-12-163-4/+45
|\
| * Add class level case operator support for error dispatching in RescuableGenadi Samokovarov2014-12-103-4/+45
* | Merge pull request #18059 from andreynering/ar-guides-queryingRafael Mendonça França2014-12-161-5/+28
|\ \
| * | Improving Method Chaining section [ci skip]Andrey Nering2014-12-161-5/+28
|/ /
* | Merge pull request #17995 from jethroo/fix/assert_template_with_unsupported_l...Rafael Mendonça França2014-12-162-0/+9
|\ \
| * | adding that assert_template with :layout will raise ArgumentError for unknown...Carsten Wirth2014-12-162-0/+9
* | | Merge pull request #18055 from jonatack/patch-8Zachary Scott2014-12-161-2/+2
|\ \ \
| * | | "backoffice" -> "back office", "lookup" -> "look up"Jon Atack2014-12-161-2/+2
|/ / /
* | | Merge pull request #18049 from yuki3738/fix_rails_db_command_errorRafael Mendonça França2014-12-161-1/+1
|\ \ \
| * | | Add a code checking about file or not to the rails db commandyuki37382014-12-161-1/+1
* | | | Merge pull request #18052 from timoschilling/reset_variantsRafael Mendonça França2014-12-162-1/+9
|\ \ \ \
| * | | | allow reseting of request variantsTimo Schilling2014-12-162-1/+9
* | | | | Merge pull request #18032 from claudiob/add-test-for-after-validate-callbacksRafael Mendonça França2014-12-162-6/+28
|\ \ \ \ \
| * | | | | Add AM test: after/around callback returning falseclaudiob2014-12-141-4/+15
| * | | | | Add AM test for after_validation returning falseclaudiob2014-12-141-2/+13
* | | | | | Merge pull request #18054 from jonatack/add_content_tag_testRafael Mendonça França2014-12-161-0/+5
|\ \ \ \ \ \
| * | | | | | Test to ensure content_tag works when fixing #17661Jon Atack2014-12-161-0/+5
* | | | | | | Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminatorRafael Mendonça França2014-12-162-19/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add test for `:skip_after_callbacks_if_terminated`claudiob2014-12-142-19/+38
| |/ / / / /
* | | | | | Merge pull request #18050 from jonatack/patch-13Xavier Noria2014-12-161-7/+7
|\ \ \ \ \ \
| * | | | | | Improve section in constant autoload guideJon Atack2014-12-161-7/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18036 from claudiob/remove-redundant-tests-about-around-a...Rafael Mendonça França2014-12-161-19/+1
|\ \ \ \ \ \
| * | | | | | Remove misleading test: around_action return falseclaudiob2014-12-151-19/+1
* | | | | | | Merge pull request #18053 from georgemillo/patch-2Arthur Nogueira Neves2014-12-161-3/+3
|\ \ \ \ \ \ \
| * | | | | | | English fix [ci skip]George Millo2014-12-161-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #18051 from jonatack/patch-14Eileen M. Uchitelle2014-12-161-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve grammarJon Atack2014-12-161-2/+2
|/ / / / / / /