aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add migration versioning example to the changelog. [ci skip]Yves Senn2016-01-121-0/+8
* Merge pull request #23004 from matthewd/default-scope-stiMatthew Draper2016-01-127-19/+61
|\
| * Skip the STI condition when evaluating a default scopeMatthew Draper2016-01-124-3/+24
| * Active scopes apply to child classes, though not parents/siblingsMatthew Draper2016-01-123-16/+37
* | Merge pull request #23020 from matthewd/frozen-headersMatthew Draper2016-01-123-1/+29
|\ \
| * | Commit before freezing the headersMatthew Draper2016-01-123-1/+29
|/ /
* | Merge pull request #20762 from maurogeorge/record-not-found-docJon Moss2016-01-111-2/+6
|\ \
| * | Add a note on ActionController guide about 404Mauro George2016-01-111-2/+6
* | | Unneeded &block parametersAkira Matsuda2016-01-121-2/+2
|/ /
* | Merge pull request #23015 from schneems/schneems/manual-environment-setRichard Schneeman2016-01-112-6/+17
|\ \ | |/ |/|
| * Allow manually setting environment valueschneems2016-01-112-6/+17
|/
* Merge pull request #23003 from y-yagi/remove_warningsKasper Timm Hansen2016-01-111-2/+2
|\
| * remove warnings from rake testyuuji.yaginuma2016-01-111-2/+2
* | Merge pull request #22808 from y-yagi/do_not_clear_all_reportersKasper Timm Hansen2016-01-111-1/+2
|\ \ | |/ |/|
| * delete only unnecessary reporteryuuji.yaginuma2016-01-111-1/+2
* | Merge pull request #22998 from kamipo/extract_mysql_column_classSean Griffin2016-01-104-85/+97
|\ \
| * | Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...Ryuta Kamizono2016-01-113-29/+35
| * | Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`Ryuta Kamizono2016-01-113-56/+62
* | | Merge pull request #20638 from jaimeiniesta/locale-aware-pluralize-helperKasper Timm Hansen2016-01-102-17/+36
|\ \ \ | |/ / |/| |
| * | Pass the current locale to Inflector from the pluralize text helper.Jaime Iniesta2016-01-102-17/+36
* | | Merge pull request #22833 from sivagollapalli/test_runner_with_multiple_linesKasper Timm Hansen2016-01-103-4/+87
|\ \ \
| * | | Added multiple line filters support for test runnerSiva Gollapalli2016-01-103-4/+87
* | | | Merge pull request #21181 from denisenkom/mypatchKasper Timm Hansen2016-01-101-0/+19
|\ \ \ \
| * | | | Test basic auth with symbols in login and passwordMikhail Denisenko2015-10-241-0/+19
* | | | | Merge pull request #22983 from bronson/update-mysql-in-guidesSantiago Pastorino2016-01-102-2/+1
|\ \ \ \ \
| * | | | | remove legacy mysql from guides to match #22715Scott Bronson2016-01-092-2/+1
* | | | | | Merge pull request #21995 from tak1n/masterJon Moss2016-01-101-8/+35
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix doc for rails custom configuration through config_for [skip ci]Benny Klotz2015-12-031-2/+2
| * | | | | Updated existing custom configuration for rails 5 where `config.x`Benny Klotz2015-10-191-8/+35
* | | | | | Merge pull request #22993 from akshay-vishnoi/travis-updateMatthew Draper2016-01-101-1/+1
|\ \ \ \ \ \
| * | | | | | Update postgresql version to 9.4 for travis.Akshay Vishnoi2016-01-101-1/+1
* | | | | | | Merge pull request #22992 from akshay-vishnoi/fix-docsSean Griffin2016-01-092-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ci skip] fix typoAkshay Vishnoi2016-01-102-2/+2
* | | | | | | Split out token `if` tests to trigger `before_create`.Kasper Timm Hansen2016-01-091-1/+5
* | | | | | | Revert "Switch `has_secure_token` to `before_save`."Kasper Timm Hansen2016-01-091-4/+3
* | | | | | | Switch `has_secure_token` to `before_save`.Kasper Timm Hansen2016-01-091-3/+4
* | | | | | | Add conditional_token to users.Kasper Timm Hansen2016-01-091-0/+1
* | | | | | | Merge pull request #20835 from glittershark/if-and-unless-in-secure-tokenKasper Timm Hansen2016-01-094-2/+40
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support :if and :unless in has_secure_tokenGriffin Smith2016-01-094-2/+40
|/ / / / / /
* | | | | | Merge pull request #22703 from joshsoftware/rake-log-clearKasper Timm Hansen2016-01-094-10/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | rake log:clear task updated refs[#22544]Pramod2016-01-094-10/+33
* | | | | | [ci skip] Clarify some Minitest origins.Kasper Timm Hansen2016-01-091-0/+2
* | | | | | Extract line filtering to Railties.Kasper Timm Hansen2016-01-094-64/+69
* | | | | | Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err...Richard Schneeman2016-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | match the environment variable name that actually checking and error messageyuuji.yaginuma2016-01-091-1/+1
* | | | | | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_commentप्रथमेश Sonpatki2016-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix)yui-knk2016-01-091-1/+1
* | | | | | Merge pull request #22987 from prathamesh-sonpatki/add-missing-changelong-for...Richard Schneeman2016-01-081-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976Prathamesh Sonpatki2016-01-091-0/+8
|/ / / / /
* | | | | Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-082-3/+3
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 22:57:04 +0000