aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22611 from existent-co-uk/patch-1Rafael França2015-12-161-2/+2
|\
| * Fix a couple of grammatical errors in security.mdExistent Ltd2015-12-161-2/+2
* | Merge pull request #22612 from caike/masterEileen M. Uchitelle2015-12-161-1/+1
|\ \ | |/ |/|
| * Mention the correct way to halt callback chainsCarlos Souza2015-12-161-1/+1
|/
* Merge branch 'remove-test-case'eileencodes2015-12-159-52/+64
|\
| * Run railties generated app tests in test enveileencodes2015-12-151-3/+3
| * Update test generators to use ActionDispatch::IntegrationTestAbdelkader Boudih2015-12-158-49/+61
|/
* Do not default to any SerializerSantiago Pastorino2015-12-153-8/+2
* Merge pull request #22562 from sblackstone/masterJeremy Daer2015-12-152-2/+9
|\
| * Allow users to pass flags from database.ymlStephen Blackstone2015-12-152-2/+9
* | Merge pull request #14212 from tylerhunt/fix-token-regexSean Griffin2015-12-152-1/+9
|\ \
| * | Handle tab in token authentication header.Tyler Hunt2014-02-262-1/+9
* | | Remove warning of shadowing variableRafael Mendonça França2015-12-151-1/+1
* | | Merge pull request #22596 from y-yagi/remove_extra_space_from_deprecation_msgEileen M. Uchitelle2015-12-152-2/+5
|\ \ \
| * | | remove extra spaces from deprecation messageyuuji.yaginuma2015-12-152-2/+5
* | | | Merge pull request #22595 from sstephenson/fragment_cache_keyDavid Heinemeier Hansson2015-12-154-11/+77
|\ \ \ \
| * | | | Add fragment_cache_key macro for controller-wide fragment cache key prefixesSam Stephenson2015-12-142-3/+67
| * | | | Remove ActionView::Helpers::CacheHelper#fragment_cache_keySam Stephenson2015-12-143-8/+10
| |/ / /
* | | | Merge pull request #21538 from matthewd/migration-versionMatthew Draper2015-12-1557-136/+226
|\ \ \ \
| * | | | Use a real migration version number in docsMatthew Draper2015-12-159-54/+54
| * | | | Schema uses current migration APIMatthew Draper2015-12-151-1/+1
| * | | | In 4.2 migrations, `timestamps` defaulted to `null: true`Matthew Draper2015-12-151-0/+24
| * | | | Find the delegate, even in a deeper inheritance treeMatthew Draper2015-12-151-1/+5
| * | | | Internal test migrations use the private 'Current' versionMatthew Draper2015-12-1540-64/+64
| * | | | Ensure generated migrations include a version numberMatthew Draper2015-12-153-14/+14
| * | | | Use a deliberately-invalid migration version in all doc examplesMatthew Draper2015-12-159-54/+54
| * | | | Add migration versioning via Migration subclassesMatthew Draper2015-12-155-2/+64
|/ / / /
* | | | Ensure uuid-ossp extension is present before we rely on itMatthew Draper2015-12-151-0/+2
* | | | Fix travis matrixRafael Mendonça França2015-12-141-1/+1
* | | | Add ruby-head back in the allow failures groupRafael Mendonça França2015-12-141-0/+1
|/ / /
* | | Do now allow failures with Ruby 2.3 anymoreRafael Mendonça França2015-12-141-2/+0
* | | Test with Ruby 2.3.0Rafael Mendonça França2015-12-141-0/+1
* | | Merge pull request #22564 from maximeg/legit_name_errorsSean Griffin2015-12-142-2/+45
|\ \ \
| * | | Don't catch all NameError to reraise as ActionController::RoutingError #22368Maxime Garcia2015-12-122-2/+45
| | |/ | |/|
* | | Revert "Perform a more efficient query in `Relation#any?`"Sean Griffin2015-12-143-8/+15
* | | Merge pull request #22561 from Cleggameg/patch-2Rafael Mendonça França2015-12-141-2/+2
|\ \ \
| * | | Update seeds.rb.ttPaul Clegg2015-12-141-2/+2
|/ / /
* | | Merge pull request #22395 from avokhmin/becomes-errors-base-2Sean Griffin2015-12-144-2/+43
|\ \ \
| * | | `ActiveRecord::Base#becomes` should copy the errorsVokhmin Alexey V2015-12-144-2/+43
* | | | Perform a more efficient query in `Relation#any?`Sean Griffin2015-12-142-8/+8
* | | | Merge pull request #22582 from sikachu/hwia-to_hKasper Timm Hansen2015-12-142-9/+11
|\ \ \ \
| * | | | Make Parameters#to_h and #to_unsafe_h return HWIAPrem Sichanugrist2015-12-142-9/+11
* | | | | Fix test failures caused by 574f255Sean Griffin2015-12-141-1/+1
| |/ / / |/| | |
* | | | Use a bind param for `LIMIT` and `OFFSET`Sean Griffin2015-12-145-13/+47
* | | | Deprecate limit strings with commasSean Griffin2015-12-142-3/+13
* | | | Merge pull request #22463 from tjblonsk/add_bug_report_to_contributing_mdSean Griffin2015-12-141-7/+33
|\ \ \ \
| * | | | Add specific bug reporting guidelines to contributing.md. [ci skip]Tim2015-12-111-7/+33
* | | | | Merge pull request #22209 from yui-knk/add_test_sanitize_sql_array_handles_na...Sean Griffin2015-12-142-0/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add test cases for `#sanitize_sql_array` with named_bind_variablesyui-knk2015-11-092-0/+19
* | | | | Revert "Merge pull request #22569 from seuros/remove-test-case"eileencodes2015-12-139-31/+30