aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #27665 from kenta-s/improve-compute_asset_extnameRafael França2017-01-181-1/+5
|\ \ \ \ \
| * | | | | should explicitly returns nil in else clausekenta-s2017-01-131-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #27693 from kenta-s/improve-to_sentence-methodRafael França2017-01-182-1/+11
|\ \ \ \ \
| * | | | | Fix unexpected behavior of with $,kenta-s2017-01-152-1/+11
* | | | | | Merge pull request #27688 from kenta-s/add-test-for-safe_joinRafael França2017-01-181-0/+5
|\ \ \ \ \ \
| * | | | | | Add test for safe_joinkenta-s2017-01-151-0/+5
* | | | | | | Merge pull request #27719 from matrix9180/action_cable_docs_updateRafael França2017-01-181-3/+22
|\ \ \ \ \ \ \
| * | | | | | | Update ActionCable guide to better describe SubscriptionAdapter configuration.Chad Ingram2017-01-171-3/+22
* | | | | | | | Merge pull request #27425 from matrix9180/action_cable_channel_prefixRafael França2017-01-188-0/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | Add channel_prefix support to ActionCable redis/evented_redis adapters.Chad Ingram2017-01-178-0/+72
|/ / / / / / / /
* | | | | | | | Merge pull request #27713 from coreyward/module_freeze_parent_nameRafael França2017-01-173-32/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Adjust `Module.parent_name` to work when frozen; fixes #27637Corey Ward2017-01-173-32/+41
* | | | | | | | Merge pull request #27718 from kamipo/remove_internal_public_methodsRafael França2017-01-176-23/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove `initialize_schema_migrations_table` and `initialize_internal_metadata...Ryuta Kamizono2017-01-186-23/+18
* | | | | | | | Merge pull request #27706 from y-yagi/allow_to_pass_describe_option_to_rakeRafael França2017-01-173-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | allow to pass describe option to rakeyuuji.yaginuma2017-01-173-3/+5
* | | | | | | | Fix all rubocop violationsRafael Mendonça França2017-01-174-19/+16
* | | | | | | | Merge pull request #27697 from toshimaru/rubocop-updateRafael Mendonça França2017-01-173-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename AlignWith to EnforcedStyleAlignWithtoshimaru2017-01-161-1/+1
| * | | | | | | | update rubocop to 0.47toshimaru2017-01-162-6/+6
* | | | | | | | | Merge pull request #27717 from JunichiIto/fix-byebug-platformRafael França2017-01-172-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change `platform` to `platforms`Junichi Ito2017-01-181-1/+1
| * | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.Junichi Ito2017-01-182-1/+5
* | | | | | | | | | Merge pull request #27716 from kenta-s/remove-unused-variable-regexRafael França2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused variable 'regex'kenta-s2017-01-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27712 from coreyward/resolve_decode_test_warningRafael França2017-01-171-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use appropriate assertion based on expectationCorey Ward2017-01-171-2/+7
|/ / / / / / / / /
* | | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
* | | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
* | | | | | | | | Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-175-2/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-165-2/+42
* | | | | | | | | | Merge pull request #27700 from kenta-s/remove-meaningless-line-from-adapter-testAndrew White2017-01-171-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove meaningless line from adapter_test.rbkenta-s2017-01-161-1/+0
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #24743 from kamipo/sqlite_foreing_key_supportAndrew White2017-01-178-38/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SQLite: Foreign Key SupportRyuta Kamizono2017-01-176-30/+81
| * | | | | | | | | | Should work foreign key in test schema without `if supports_foreign_keys?` st...Ryuta Kamizono2017-01-172-8/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Be a bit more explicit rather than relying on the default taskDavid Heinemeier Hansson2017-01-171-1/+1
* | | | | | | | | | Make yarn install available as a rake task via yarn:install so we can use tha...David Heinemeier Hansson2017-01-171-0/+9
* | | | | | | | | | Don't pollute Object with rubinius_skip and jruby_skipAkira Matsuda2017-01-176-55/+55
* | | | | | | | | | All currently supported rubies already have LoadError#pathAkira Matsuda2017-01-171-12/+0
* | | | | | | | | | :golf: else + if = elsifAkira Matsuda2017-01-171-10/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27704 from kmcphillips/transliterate-exceptionRafael França2017-01-163-0/+25
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | CHANGELOG: Raise ArgumentError when calling transliterate on anything other t...Kevin McPhillips2017-01-161-0/+5
| * | | | | | | | Raise ArgumentError if attempting to transliterate anything that is not a stringKevin McPhillips2017-01-162-0/+20
| | |/ / / / / / | |/| | | | | |
* | | | | | | | s/perfomed/performed/Akira Matsuda2017-01-171-1/+1
* | | | | | | | Missing require for strip_heredocAkira Matsuda2017-01-171-0/+1
|/ / / / / / /
* | | | | | | Add CHANGELOG entry for #27701Andrew White2017-01-161-0/+4
* | | | | | | Merge pull request #27701 from kamipo/translate_foreign_key_violationAndrew White2017-01-162-45/+74
|\ \ \ \ \ \ \
| * | | | | | | Translate Foreign Key violation to the specific exception for SQLite3 adapterRyuta Kamizono2017-01-162-45/+74
* | | | | | | | Merge pull request #27692 from y-yagi/make_render_work_with_ac_paramsEileen M. Uchitelle2017-01-162-2/+5
|\ \ \ \ \ \ \ \