aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix HTTPS grammarJon Moss2017-03-131-4/+4
| | | | [ci skip]
* Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ | | | | [docs] fix ActionController docs
| * [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| | | | | | | | [ci skip]
* | Merge pull request #28385 from javan/actioncable/fix-npm-packageGuillermo Iguaran2017-03-133-1/+38
|\ \ | | | | | | Restore action_cable.js UMD module support. Fixes #28366
| * | Restore action_cable.js UMD module support. Fixes #28366Javan Makhmali2017-03-113-1/+38
| | |
* | | Merge pull request #28185 from renchap/system-testing-screenshot-outputEileen M. Uchitelle2017-03-131-5/+34
|\ \ \ | | | | | | | | Dont always display inline screenshots in system testing (#28133)
| * | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 output types are supported: - simple: only display the screenshot path - artifact: display the screenshot in the terminal, using the artifact protocol (supported by some CI) - inline (default): display the screenshot in the terminal, inline (supported by some terminals) You can force the output type by setting the `RAILS_SYSTEM_TESTING_SCREENSHOT` environment variable
* | | | Merge pull request #28017 from mtsmfm/suppress-dep-warnMatthew Draper2017-03-133-0/+6
|\ \ \ \ | | | | | | | | | | Suppress deprecation warning `implementing to_yaml is deprecated`
| * | | | Suppress deprecation warning `implementing to_yaml is deprecated`Fumiaki MATSUSHIMA2017-02-153-0/+6
| | | | |
* | | | | Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaultsAkira Matsuda2017-03-133-1/+17
|\ \ \ \ \ | | | | | | | | | | | | Fixes ActionController::Rendering#with_defaults
| * | | | | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-123-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | `env` is undefined.
* | | | | | Merge pull request #28371 from kamipo/simplify_countAndrew White2017-03-121-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count`
| * | | | | | Simply forward `Calculations#count` to `Enumerable#count`Ryuta Kamizono2017-03-101-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #24203. Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is enough to call `super` simply.
* | | | | | | Fix weird documentation lineJon Moss2017-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #28372 from kamipo/delegate_as_jsonAndrew White2017-03-123-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Simply delegate `as_json` to `records`
| * | | | | | | Simply delegate `as_json` to `records`Ryuta Kamizono2017-03-103-6/+2
| |/ / / / / /
* | | | | | | Second editing pass on "Active Model Basics" guideJon Moss2017-03-121-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of grammar, etc fixes. [ci skip]
* | | | | | | First editing pass on "Active Model Basics" guideJon Moss2017-03-121-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of grammar, etc fixes. [ci skip]
* | | | | | | Add link to mentioned API [ci skip] (#28392)Vipul A M2017-03-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #27152 from tjai89/patch-5Vipul A M2017-03-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add link to API documentation [ci skip]
| * | | | | | Add link to API documentationKirill Zhuravlov2016-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Add a link to http://api.rubyonrails.org/classes/ActionController.html in the beginning of an article.
* | | | | | | Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guideVipul A M2017-03-121-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in the security guide
| * | | | | | | Fix typo in the security guidebogdanvlviv2017-03-121-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | AS:Cache:MemoryStore doc fixes [ci skip] (#28389)Vipul A M2017-03-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #27051 from devonestes/adding-cache-clear-docsVipul A M2017-03-121-0/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add missing documentation for MemoryStore#clear [ci skip]
| * | | | | | Add missing documentation for MemoryStore#clear [ci skip]Devon Estes2016-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing some form of documentation for this method, so I've gone ahead and added some!
* | | | | | | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_testEileen M. Uchitelle2017-03-111-8/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Use correct value in `reverse_merge` test
| * | | | | | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
| | | | | | |
* | | | | | | Merge pull request #28380 from shime/docs-actionpack-apiAndrew White2017-03-111-4/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | [docs] remove unnecessary sentence
| * | | | | | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* / / / / / Fix indentation and formatting in CHANGELOGs [ci skip]Ryuta Kamizono2017-03-112-19/+19
|/ / / / /
* | | | | Add @takkanm credits in the changelog [ci skip]Rafael Mendonça França2017-03-101-1/+1
| | | | |
* | | | | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-103-0/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]
| * | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-093-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This PR adds the `reverse_merge` and `reverse_merge!` method to `ActionController::Parameters` - Fixes #28353
* | | | | | Merge pull request #28373 from godfat/fix-cache-middleware-with-throwRafael França2017-03-102-4/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure local cache cleared even it's throwing:
| * | | | | | Make sure local cache cleared even it's throwing:Lin Jen-Shin2017-03-102-4/+15
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We (GitLab) hit into an issue that somewhere in the middleware chain was throwing `:warden`, which was caught in the wrapping middleware, but `LocalCache::Middleware` was not aware of it. It should look like: ``` ruby result = catch(:warden) do @app.call(env) end ``` Source: https://github.com/hassox/warden/blob/090ed153dbd2f5bf4a1ca672b3018877e21223a4/lib/warden/manager.rb#L35-L37 Using `ensure` could make sure that we would always do the cleanup, and better yet, avoid `rescue Exception` which we all should know that could cause some issues which could be very hard to debug. Please check the discussion thread for more context: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108
* | | | | | Merge pull request #28370 from kamipo/remove_conditions_params_from_delete_allRafael França2017-03-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove conditions parameter from `NullRelation#delete_all`
| * | | | | | Remove conditions parameter from `NullRelation#delete_all`Ryuta Kamizono2017-03-101-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Follow up of e7381d289e4f8751dcec9553dcb4d32153bd922b.
* | | | | | Merge pull request #28375 from baerjam/improve-testing-documentaionVipul A M2017-03-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improve readability of testing guide [ci skip]
| * | | | | Improve readability of testing guide [ci skip]James Baer2017-03-101-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Small change to improve the readability in section 2.3 of the testing guide.
* | | | | Add missing credit [ci skip]Ryuta Kamizono2017-03-101-0/+2
| | | | |
* | | | | Merge pull request #28182 from y-yagi/show_correct_rails_commandsKasper Timm Hansen2017-03-098-18/+47
|\ \ \ \ \ | | | | | | | | | | | | Show correct commands in help
| * | | | | Show correct commands in helpyuuji.yaginuma2017-03-038-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently rails' help shows only namespace. However, the secrets command needs to specify command. Therefore, I fixed the command to display in help.
* | | | | | [ci skip] Document read_encrypted_secrets config.Kasper Timm Hansen2017-03-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly just that it's there. Closes #28193.
* | | | | | Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_nameRafael Mendonça França2017-03-093-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Deprecate `Migrator.schema_migrations_table_name`
| * | | | | | Deprecate `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-093-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 67fba0cf `SchemaMigration` model was extracted. Use `SchemaMigration.table_name` instead.
* | | | | | | Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_targetEileen M. Uchitelle2017-03-093-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix select with block doesn't return newly built records in has_many association
| * | | | | | | Fix select with block doesn't return newly built records in has_many associationRyuta Kamizono2017-03-093-2/+14
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `select` in `QueryMethods` is also an enumerable method. Enumerable methods with block should delegate to `records` on `CollectionProxy`, not `scope`. Fixes #28348.
* | | | | | | Merge branch 'refactor-system-test-driver'eileencodes2017-03-099-91/+64
|\ \ \ \ \ \ \
| * | | | | | | Call system test driver per-instance rather than globallyeileencodes2017-03-097-42/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the system test subclasses would call `driven_by` when the app booted and not again when the test was initialized which resulted in the driver from whichever class was called last to be used in tests. In rails/rails#28144 the `driven_by` method was changed to run `use` on setup and `reset` on teardown. While this was a viable fix this really pointed to the problem that system test `driven_by` was a global setting, rather than a per-class setting. To alieviate this problem calling the driver should be done on an instance level, rather than on the global level. I added an `initialize` method to `SystemTestCase` which will call `use` on the superclass driver. Running the server has been moved to `start_application` so that it only needs to be called once on boot and no options from `driven_by` were being passed to it. This required a largish rewrite of the tests. Each test needs to utilize the subclass so that it can properly test the drivers. `ActionDispatch::SystemTestCase` shouldn't be called directly anymore.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 00:28:42 +0000