aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove redundant instances of the word 'simply' from documentation, on the ↵Emma Barnes2017-07-151-4/+4
| | | | basis that if it was simple, the user wouldn't be reading the docs
* Merge pull request #29798 from kamipo/remove_useless_aliased_table_nameKasper Timm Hansen2017-07-154-18/+1
|\ | | | | Remove useless `aliased_table_name` in `JoinDependency`
| * Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
| | | | | | | | If `table.table_alias` is not nil, it is enough to use `table` simply.
* | Merge pull request #29800 from koic/remove_encoding_utf8_magic_commentKasper Timm Hansen2017-07-152-2/+0
|\ \ | | | | | | Remove encoding utf-8 magic comment
| * | Remove encoding utf-8 magic commentKoichi ITO2017-07-152-2/+0
|/ /
* | Merge pull request #29797 from y-yagi/fix_doc_format_for_time_helpersRyuta Kamizono2017-07-151-2/+2
|\ \ | |/ |/| Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip]
| * Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip]yuuji.yaginuma2017-07-151-2/+2
| |
* | Merge pull request #29786 from willnet/remove-javascript_link_tag-optionsRyuta Kamizono2017-07-141-32/+0
|\ \ | | | | | | [ci skip]Remove options of javascript_link_tag and stylesheet_link_tag in guides
| * | [ci skip]Remove options of javascript_link_tag and stylesheet_link_tag in guideswillnet2017-07-141-32/+0
|/ /
* | Merge pull request #29772 from ↵Kasper Timm Hansen2017-07-131-1/+2
|\ \ | | | | | | | | | | | | y-yagi/allow_to_edit_secrets_in_mutiple_applications_at_the_same_time Allow to edit secrets in mutiple apps at the same time
| * | Allow to edit secrets in mutiple apps at the same timeyuuji.yaginuma2017-07-131-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | In encrypted secrets, the tmp file is used as a fixed file (`secrets.yml.enc` under the tmp directory). And that tmp file will be removed after process. Therefore, if edit secrets at the same time with multiple applications, the tmp file was conflicting. In order to avoid the above issue, added pid to tmp file.
* | Merge pull request #29778 from yui-knk/fix_charset_docप्रथमेश Sonpatki2017-07-131-1/+1
|\ \ | |/ |/| [ci skip] `Response#charset=` uses `default_charset` when `nil` is passed
| * `Response#charset=` uses `default_charset` when `nil` is passedyui-knk2017-07-131-1/+1
|/
* Merge pull request #29699 from lugray/represent_boolean_as_integerMatthew Draper2017-07-1212-8/+148
|\ | | | | Change sqlite3 boolean serialization to use 1 and 0
| * Change sqlite3 boolean serialization to use 1 and 0Lisa Ugray2017-07-1112-8/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abstract boolean serialization has been using 't' and 'f', with MySQL overriding that to use 1 and 0. This has the advantage that SQLite natively recognizes 1 and 0 as true and false, but does not natively recognize 't' and 'f'. This change in serialization requires a migration of stored boolean data for SQLite databases, so it's implemented behind a configuration flag whose default false value is deprecated. The flag itself can be deprecated in a future version of Rails. While loaded models will give the correct result for boolean columns without migrating old data, where() clauses will interact incorrectly with old data. While working in this area, also change the abstract adapter to use `"TRUE"` and `"FALSE"` as quoted values and `true` and `false` for unquoted. These are supported by PostreSQL, and MySQL remains overriden.
* | Merge pull request #29764 from georgeclaghorn/third-party-cache-store-configMatthew Draper2017-07-121-1/+1
|\ \ | | | | | | Fix configuring third-party cache stores such as ActiveSupport::Cache::RedisStore
| * | Fix configuring third-party cache stores such as ↵George Claghorn2017-07-121-1/+1
|/ / | | | | | | | | | | ActiveSupport::Cache::RedisStore Broken in 8da30ad.
* | normalize_path used to be nil tolerantAkira Matsuda2017-07-122-0/+5
| | | | | | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* | Merge pull request #29746 from kamipo/extract_fake_klassRafael França2017-07-113-52/+38
|\ \ | | | | | | Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`
| * | Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`Ryuta Kamizono2017-07-113-52/+38
| | | | | | | | | | | | | | | `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb` are almost the same.
* | | Merge pull request #29748 from koic/enable_layout_empty_line_after_magic_commentRafael França2017-07-11547-0/+549
|\ \ \ | | | | | | | | Enable Layout/EmptyLineAfterMagicComment cop
| * | | [Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
| | | |
| * | | [Action View] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
| | | |
| * | | [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1116-0/+16
| | | |
| * | | [Active Job] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-11100-0/+100
| | | |
| * | | [Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-11424-0/+424
| | | |
| * | | Enable Layout/EmptyLineAfterMagicComment copKoichi ITO2017-07-111-0/+3
| | |/ | |/|
* | | Merge pull request #29756 from yuki24/fix-englishRobin Dupret2017-07-111-1/+1
|\ \ \ | | | | | | | | Fix english for the rescue_from warning [ci skip]
| * | | Fix english for the rescue_from warning [ci skip]Yuki Nishijima2017-07-111-1/+1
|/ / /
* | | Merge pull request #29752 from palkan/masterMatthew Draper2017-07-121-1/+1
|\ \ \ | |/ / |/| | Fix PostgreSql adapter setup for ActionCable tests
| * | Fix postgresql adapter setup for ActionCable testspalkan2017-07-111-1/+1
|/ / | | | | | | | | (cherry picked from commit e2093c1f678175bde7c37c848686d979427346e1) (cherry picked from commit d7dbe48273bd9e0adb1de5b52e3cdaeb4a65630b)
* | Merge pull request #29745 from y-yagi/fix_typo_in_method_nameMatthew Draper2017-07-111-1/+1
|\ \ | |/ |/| Fix typo in method name
| * Fix typo in method nameyuuji.yaginuma2017-07-111-1/+1
|/
* :scissors:Ryuta Kamizono2017-07-111-1/+0
| | | | [ci skip]
* Add backticks for class names in CHANGELOG [ci skip]Ryuta Kamizono2017-07-111-3/+3
|
* Merge pull request #29742 from lugray/default_protect_from_forgeryRafael França2017-07-1010-4/+79
|\ | | | | Default protect from forgery
| * Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-102-0/+39
| | | | | | | | | | | | Since we now default to `protect_from_forgery with: :exception`, provide a wrapper to `skip_before_action :verify_authenticity_token` for disabling forgery protection.
| * Protect from forgery by defaultLisa Ugray2017-07-109-4/+40
| | | | | | | | | | | | | | | | Rather than protecting from forgery in the generated ApplicationController, add it to ActionController::Base by config. This configuration defaults to false to support older versions which have removed it from their ApplicationController, but is set to true for Rails 5.2.
* | Merge pull request #29572 from kaspth/test-runner-no-eager-requireKasper Timm Hansen2017-07-1015-275/+251
|\ \ | |/ |/| Don't eagerly require Rails' minitest plugin.
| * * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-1015-275/+251
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making the Rails minitest behave like a standard minitest plugin we're much more likely to not break when people use other minitest plugins. Like minitest-focus and pride. To do this, we need to behave like minitest: require files up front and then perform the plugin behavior via the at_exit hook. This also saves us a fair bit of wrangling with test file loading. Finally, since the environment and warnings options have to be applied as early as possible, and since minitest loads plugins at_exit, they have to be moved to the test command. * Don't expect the root method. It's likely this worked because we eagerly loaded the Rails minitest plugin and that somehow defined a root method on `Rails`. * Assign a backtrace to failed exceptions. Otherwise Minitest pukes when attempting to filter the backtrace (which Rails' backtrace cleaner then removes). Means the exception message test has to be revised too. This is likely caused by the rails minitest plugin now being loaded for these tests and assigning a default backtrace cleaner.
* Added time helper method `freeze_time` which is an alias for `travel_to ↵प्रथमेश Sonpatki2017-07-103-0/+47
| | | | Time.now` (#29681)
* Merge pull request #29735 from ↵Kasper Timm Hansen2017-07-102-1/+9
|\ | | | | | | | | y-yagi/make_sidekiq_and_resque_integration_tests_work_in_ci Make sidekiq and resque integration tests work in CI
| * Make sidekiq and resque integration tests work in CIyuuji.yaginuma2017-07-102-1/+9
|/ | | | | | | | | Since f55ecc6, the integration test of sidekiq and resque is not working in CI. https://travis-ci.org/rails/rails/jobs/251783876 Because f55ecc6 required a password to access redis. Therefore, handling by passing passwords when connecting to redis.
* Merge pull request #29733 from kirs/frozen-activejobMatthew Draper2017-07-10102-0/+102
|\ | | | | Use frozen-string-literal in ActiveJob
| * Use frozen-string-literal in ActiveJobKir Shatrov2017-07-09102-0/+102
|/
* Merge pull request #29731 from castrodd/patch-1Kasper Timm Hansen2017-07-091-2/+2
|\ | | | | [ci skip] Updated language on validations.
| * [ci skip] Updated language on validations.Daniel Castro2017-07-091-2/+2
| |
* | Merge pull request #29730 from bdewater/update-encryptor-docsKasper Timm Hansen2017-07-091-5/+6
|\ \ | |/ |/| Update MessageEncryptor example to use dynamic key length
| * [ci skip] update MessageEncryptor example to use the key length as returned ↵Bart de Water2017-07-091-5/+6
| | | | | | | | by OpenSSL
* | Merge pull request #29721 from y-yagi/fix_29696Kasper Timm Hansen2017-07-092-2/+36
|\ \ | | | | | | Treat secrets as binary
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 08:57:51 +0000