aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unneeded Deprecation silenceRafael Mendonça França2017-01-061-5/+3
* Merge pull request #27294 from eavgerinos/doc-ar-callbacks-orderRafael França2017-01-061-0/+49
|\
| * [ci skip] ActiveRecord: Document order of CallbacksAggelos Avgerinos2016-12-221-0/+49
* | Merge pull request #27586 from maclover7/jm-fix-27584Rafael França2017-01-062-3/+11
|\ \
| * | Update `cookies` helper on all HTTP requestsJon Moss2017-01-052-3/+11
|/ /
* | Privatize unneededly protected methods in Active RecordAkira Matsuda2017-01-055-16/+12
* | `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-0560-71/+71
* | CI against jruby-9.1.6.0Akira Matsuda2017-01-051-3/+3
* | This method is never called since 8e633e505880755e7e366ccec2210bbe2b5436e7Akira Matsuda2017-01-051-7/+0
* | bundle u sqlite3Akira Matsuda2017-01-051-3/+3
* | Merge pull request #27580 from kamipo/optimize_information_schema_queryRafael França2017-01-051-0/+1
|\ \
| * | Optimizing information_schema query for `foreign_keys`Ryuta Kamizono2017-01-051-0/+1
* | | Fix style guide violationsRafael Mendonça França2017-01-055-9/+8
|/ /
* | Make sure we generate keys that can be used with the cipherRafael Mendonça França2017-01-041-4/+4
* | Merge pull request #26480 from tbrisker/fix-26461Rafael França2017-01-041-2/+7
|\ \
| * | Reword according to feedbackTomer Brisker2016-09-151-8/+7
| * | Clarify that mattr_* creates public methodsTomer Brisker2016-09-131-0/+6
* | | Merge pull request #27549 from mpugach/consider_params_in_current_pageRafael França2017-01-043-2/+20
|\ \ \
| * | | Add `check_parameters` option to `current_page?`Maksym Pugach2017-01-043-2/+20
* | | | Merge pull request #27578 from kenta-s/fix-typo-in-asset_pipeline_mdJon Moss2017-01-041-2/+2
|\ \ \ \
| * | | | Fix typo in asset_pipeline.md [ci skip]kenta-s2017-01-051-2/+2
|/ / / /
* | | | Merge pull request #27575 from yahonda/diag_like_26370Rafael França2017-01-042-2/+2
|\ \ \ \
| * | | | Require "models/post" before "models/comment"Yasuo Honda2017-01-042-2/+2
|/ / / /
* | | | Merge pull request #27446 from zachahn/asset-hash-md5-to-sha256Rafael França2017-01-041-22/+24
|\ \ \ \
| * | | | Update asset fingerprinting informationZach Ahn2016-12-231-22/+24
* | | | | String#end_with? should be faster than Regexp hereAkira Matsuda2017-01-051-1/+1
* | | | | There's no such moduleAkira Matsuda2017-01-052-8/+8
* | | | | No need to :doc: a public methodAkira Matsuda2017-01-051-1/+1
* | | | | Merge pull request #27485 from cih/hmt-warningAndrew White2017-01-045-0/+38
|\ \ \ \ \
| * | | | | Raise error when has_many through is defined before through associationChris Holmes2017-01-045-0/+38
|/ / / / /
* | | | | Merge pull request #27552 from jarijokinen/fix-default-locale-code-exampleAndrew White2017-01-041-5/+10
|\ \ \ \ \
| * | | | | Add instructions for available_locales [skip ci]Jari Jokinen2017-01-041-5/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-varsRafael Mendonça França2017-01-033-1/+18
|\ \ \ \ \
| * | | | | Rails.env falls back to dev mode when env var is emptyDaniel Deng2017-01-043-1/+18
* | | | | | Merge pull request #27564 from kamipo/fix_find_by_active_record_base_object-2Rafael França2017-01-032-3/+8
|\ \ \ \ \ \
| * | | | | | Fix `find_by` and `where` consistencyRyuta Kamizono2017-01-042-3/+8
* | | | | | | Fix configuration test now that Metal#env was removedRafael Mendonça França2017-01-031-1/+1
|/ / / / / /
* | | | | | Revert "Merge pull request #21233 from mtsmfm/disable-referential-integrity-w...Rafael Mendonça França2017-01-0325-207/+114
* | | | | | Revert "Merge pull request #27550 from mtsmfm/fix-generator-command-for-neste...Rafael Mendonça França2017-01-039-29/+9
* | | | | | Merge pull request #27550 from mtsmfm/fix-generator-command-for-nested-rails-...Rafael França2017-01-039-9/+29
|\ \ \ \ \ \
| * | | | | | Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-039-9/+29
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #27562 from maclover7/jm-as-rm-requireRafael Mendonça França2017-01-031-3/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary require statementsJon Moss2017-01-031-3/+0
* | | | | | | Remove deprecated ActionController::Metal.callRafael Mendonça França2017-01-033-17/+11
* | | | | | | List full class nameJon Moss2017-01-031-1/+1
* | | | | | | Remove deprecated Metal#envRafael Mendonça França2017-01-032-5/+4
* | | | | | | Remove unneeded Deprecation.silenceRafael Mendonça França2017-01-031-3/+1
* | | | | | | Merge pull request #27563 from kamipo/fix_typoRafael França2017-01-032-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix typo s/permited/permitted/Ryuta Kamizono2017-01-042-3/+3
* | | | | | | | Remove test to the db:test:cloneRafael Mendonça França2017-01-031-10/+0