aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27632 from dixpac/repo_initializeRafael Mendonça França2017-01-184-2/+20
|\ | | | | | | Initalize git repo when creatin new rails app
| * Initalize git repo when creatin new rails appdixpac2017-01-124-2/+20
| | | | | | | | | | * If `--skip-git` is not specified initalize git repo when creating new rails app
* | Merge pull request #27653 from s-jcs/feature/adjust_indentation_for_generatorRafael França2017-01-181-1/+1
|\ \ | | | | | | match indentations in environment template
| * | match indentationsnin0422017-01-121-1/+1
| | |
* | | Merge pull request #27665 from kenta-s/improve-compute_asset_extnameRafael França2017-01-181-1/+5
|\ \ \ | | | | | | | | compute_asset_extname should explicitly return nil in else clause
| * | | 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 `to_sentence` with $,
| * | | 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_join`
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [WIP] Update ActionCable guide to better describe SubscriptionAdapter config
| * | | | | 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 AC redis/evented_redis adapters
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Module#parent_name broken for frozen classes
| * | | | | 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_table` internal public methods
| * | | | | | Remove `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-186-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` internal public methods These internal methods accidentally appeared in the doc, and so almost useless. It is enough to create these internal tables directly, and indeed do so in several places. https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/schema.rb#L55 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/railties/databases.rake#L6 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/tasks/database_tasks.rb#L230
* | | | | | | 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 rake
| * | | | | | allow to pass describe option to rakeyuuji.yaginuma2017-01-173-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `Thor::HELP_MAPPINGS` contains `-D`, so `bin/rails -D` show rails's help. But, in Rails 5.0.1, `bin/rails -D` show the description of rake task. I think that it is better to have the same behavior.
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rubocop
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.
| * | | | | | | | 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'
| * | | | | | | | 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 expectation
| * | | | | | | | Use appropriate assertion based on expectationCorey Ward2017-01-171-2/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a stern Minitest “warning” about an upcoming behavior change in MiniTest 6 that will result in the test failing. https://github.com/seattlerb/minitest/issues/666
* | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | | | | | | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | | | | | | | 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"]`
| * | | | | | | | 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.rb
| * | | | | | | | | 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 Support
| * | | | | | | | | SQLite: Foreign Key SupportRyuta Kamizono2017-01-176-30/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://www.sqlite.org/foreignkeys.html
| * | | | | | | | | Should work foreign key in test schema without `if supports_foreign_keys?` ↵Ryuta Kamizono2017-01-172-8/+6
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement If an adapter does not support foreign key feature, should be noop. https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/foreign_key_test.rb#L288-L294 https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/references_foreign_key_test.rb#L208-L214
* | | | | | | | | 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 ↵David Heinemeier Hansson2017-01-171-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that as a dependency for assets:precompile
* | | | | | | | | Don't pollute Object with rubinius_skip and jruby_skipAkira Matsuda2017-01-176-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we call them only in the tests
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Raise ArgumentError if attempting to transliterate nil
| * | | | | | | CHANGELOG: Raise ArgumentError when calling transliterate on anything other ↵Kevin McPhillips2017-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than a string
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Missing require for strip_heredocAkira Matsuda2017-01-171-0/+1
|/ / / / / /