aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #26094 from igorkasyanchuk/masterRafael França2016-08-163-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Show unpermitted parameters as symbols in logs (so they could be copy-pasted ...Igor Kasyanchuk2016-08-103-7/+7
* | | | | | | | | | | | | | Merge pull request #26117 from kamipo/make_association_quary_to_preparable_step1Rafael Mendonça França2016-08-161-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make association queries to preparable: Step 1Ryuta Kamizono2016-08-111-11/+10
* | | | | | | | | | | | | | | Merge pull request #26074 from kamipo/where_by_attribute_with_array_or_rangeRafael França2016-08-163-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | `where` by `array|range` attribute with array or range valueRyuta Kamizono2016-08-113-7/+23
* | | | | | | | | | | | | | | | Merge pull request #26097 from Dagnan/fix_recordnotfound_args_rebasedRafael França2016-08-164-4/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | When calling association.find RecordNotFound is now raised with the same argu...Michel Pigassou2016-08-134-4/+33
* | | | | | | | | | | | | | | | | Merge pull request #26151 from kamipo/avoid_to_allow_unused_splat_argsRafael França2016-08-163-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Avoid to allow unused splat args for `t.timestamps` in `create_table`Ryuta Kamizono2016-08-143-6/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #26155 from kamipo/refactor_quoted_columns_for_indexRafael Mendonça França2016-08-162-29/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Refactor `quoted_columns_for_index` by extracted `add_options_for_index_columns`Ryuta Kamizono2016-08-142-29/+25
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #26156 from sfaxon/route_visualizer_fixRafael França2016-08-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fix Rails.application.routes.router.visualizer for router debuggingSeth Faxon2016-08-131-1/+3
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #26162 from kamipo/take_respects_dirty_targetRafael França2016-08-163-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | `CollectionProxy#take` should respect dirty targetRyuta Kamizono2016-08-143-19/+19
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #26019 from agrobbin/schema-load-unique-column-indicesRafael França2016-08-163-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | support multiple indexes on the same column when loading the schemaAlex Robbin2016-08-023-3/+19
* | | | | | | | | | | | | | | | | | Merge pull request #26157 from y-yagi/remove_test_mailers_when_skipping_actio...Rafael França2016-08-162-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | remove "test/mailers" directory when skipping action-maileryuuji.yaginuma2016-08-142-0/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #26130 from yui-knk/drop_tableRafael França2016-08-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Drop a temporary table before end of a test caseyui-knk2016-08-141-1/+3
* | | | | | | | | | | | | | | | | | | Add three new rubocop rulesRafael Mendonça França2016-08-16362-1797/+1809
* | | | | | | | | | | | | | | | | | | Merge pull request #26177 from achinn/ac-live-deadlockMatthew Draper2016-08-163-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix deadlock that can occur when child live thread tries to load a constant a...Alex Chinn2016-08-153-1/+30
* | | | | | | | | | | | | | | | | | | | Merge pull request #26178 from claudiob/load-table-metadataRafael França2016-08-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Eager autoload ActiveRecord::TableMetadataclaudiob2016-08-151-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #26176 from stomar/clarify-update-taskVipul A M2016-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Clarify use of update task on 4.2 and earlier [ci skip]Marcus Stollsteimer2016-08-151-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #26167 from kamipo/remove_find_nth_with_limit_and_offsetKasper Timm Hansen2016-08-151-34/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove `find_nth_with_limit_and_offset` private methodRyuta Kamizono2016-08-151-34/+13
* | | | | | | | | | | | | | | | | | | | Merge pull request #26170 from eugeneius/rm_log_subscriber_odd_ivarKasper Timm Hansen2016-08-151-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove odd ivar from ActiveRecord::LogSubscriberEugene Kenny2016-08-151-5/+0
* | | | | | | | | | | | | | | | | | | | Merge pull request #26160 from prathamesh-sonpatki/use-encoding-from-metalMatthew Draper2016-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | AC::Metal is already defining default encoding as UTF 8, let's reuse it.Prathamesh Sonpatki2016-08-141-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #25570 from y-yagi/remove_useless_parameterEileen M. Uchitelle2016-08-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remove useless parameteryuuji.yaginuma2016-06-291-4/+4
* | | | | | | | | | | | | | | | | | | | | Merge pull request #26168 from chuckdishmon/fix-plural-usageJon Moss2016-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix usage of pluralized wordchuckdishmon2016-08-141-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #26166 from kamipo/fix_ar_fixtures_docJon Moss2016-08-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix `ActiveRecord::FixtureSet` docs [ci skip]Ryuta Kamizono2016-08-151-4/+4
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Revert "Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]"Xavier Noria2016-08-151-12/+12
* | | | | | | | | | | | | | | | | | | | Merge pull request #26150 from kamipo/consolidate_ar_test_case_and_as_test_caseSean Griffin2016-08-143-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR test...Ryuta Kamizono2016-08-143-21/+20
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Pass along original attribute to save later recursionAaron Patterson2016-08-142-1/+8
* | | | | | | | | | | | | | | | | | | Merge pull request #26012 from grosser/grosser/missingSean Griffin2016-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | add index to array methods so we can call it on relationsMichael Grosser2016-08-121-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #26163 from olivierlacan/clarify-autoloading-disabledJon Moss2016-08-141-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]Olivier Lacan2016-08-141-12/+12
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | [ci skip] Link to the request helpers documentation.Kasper Timm Hansen2016-08-141-0/+3