aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_pluginsJeremy Daer2015-10-112-1/+2
|\ | | | | do not generate manifest.js in plugins
| * do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
| | | | | | | | Since the plugin generator do not generate assets, I think manifest.js also that it unnecessary.
* | Merge pull request #21934 from etdev/docs/deep-dup-typoClaudio B.2015-10-111-1/+1
|\ \ | |/ |/| [ci skip] Fix typo in deep_dup docs
| * [ci skip] Fix typo in deep_dup docsEric Turner2015-10-121-1/+1
|/
* Merge pull request #11410 from bogdan/increment-concurencyJeremy Daer2015-10-105-40/+42
|\ | | | | | | Make AR#increment! and #decrement! concurrency-safe
| * Make #increment! and #decrement! methods concurency safeBogdan Gusiev2015-10-055-40/+41
| |
* | Merge pull request #20940 from rafaelsales/allow-multiple-root-routesRafael Mendonça França2015-10-102-2/+11
|\ \ | | | | | | Allow multiple `root` routes in same scope level
| * | Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application has multiple root entries with different constraints, the current solution is to use `get '/'`. Example: **Currently I have to do:** ```ruby get '/', to: 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } get '/', to: 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` **But I would like to do:** ```ruby root 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } root 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` Other URL matchers such as `get`, `post`, etc, already allows this, so I think it's fair that `root` also allow it since it's just a shortcut for a `get` internally.
* | Merge pull request #21631 from RobinClowers/fix-cache-instrumentationJeremy Daer2015-10-093-13/+43
|\ \ | | | | | | | | | Fix cache fetch instrumentation
| * | Fix Cache#fetch instrumentationRobin Clowers2015-09-141-13/+11
| | | | | | | | | | | | | | | Before this change, you couldn't tell if a read was a hit or not when you called fetch.
| * | Add test cases for Cache#fetch instrumentationRobin Clowers2015-09-141-0/+28
| | |
* | | Merge pull request #21927 from ronakjangir47/remove_is_a_specRafael Mendonça França2015-10-092-3/+5
|\ \ \ | | | | | | | | used predicate methods to avoid is_a? checks
| * | | used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
| | | |
* | | | Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gemRafael Mendonça França2015-10-091-1/+1
|\ \ \ \ | |/ / / |/| | | update to ruby-oci8 - 2.2.0
| * | | update to ruby-oci8 - 2.2.0Gaurav Sharma2015-10-101-1/+1
| | | | | | | | | | | | It stopped `ruby 1.8` support, we already switched to `ruby >= 2.2.2`
* | | | Merge pull request #21878 from Gaurav2728/require_monitorMatthew Draper2015-10-101-1/+1
|\ \ \ \ | |/ / / |/| | | monitor is require for SneakersAdapter
| * | | monitor is require for SneakersAdapterGaurav Sharma2015-10-061-1/+1
| | | | | | | | | | | | we are using `@monitor = Monitor.new` that inherit from Monitor class, we leave behind this commit https://github.com/rails/rails/commit/cbfc8b36
* | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_publicSean Griffin2015-10-081-1/+2
|\ \ \ \ | | | | | | | | | | change `prepare_destination` to public API [ci skip]
| * | | | change `prepare_destination` to public API [ci skip]yuuji.yaginuma2015-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `prepare_destination` has been used in the template file for the generator, I think it should be a public API ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/test_unit/generator/templates/generator_test.rb#L8
* | | | | Avoid leaking the first relation we call #first onMatthew Draper2015-10-092-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous implementation, the block passed to define_singleton_method, which will live forever as the method body, captures the parameters (args and block) in its enclosure. For the current_scope registry, that can include an AR::Relation.
* | | | | Merge pull request #21911 from tommyblue/masterRafael Mendonça França2015-10-081-3/+8
|\ \ \ \ \ | | | | | | | | | | | | Modify the scope method documentation
| * | | | | Modify the scope method documentationTommaso Visconti2015-10-081-3/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a paragraph to the documentation of the `ActiveRecord::Scoping::Named.scope` method, explaining that the method is intended to return an ActiveRecord::Relation object to be composable with other scopes. In the case that in the case that `nil` or `false` are returned, the method returns an `all` relation instead. This unexpected behaviour is mentioned in #19249 #14256 #21465 and #21882 and wasn't documented at all. This commit adds this documentation.
* | | | | Merge pull request #21894 from abhishekjain16/refactor_with_dryRafael Mendonça França2015-10-081-10/+6
|\ \ \ \ \ | | | | | | | | | | | | Follow DRY principle and remove duplication
| * | | | | Follow DRY principle and remove duplicationAbhishek Jain2015-10-081-10/+6
| | | | | |
* | | | | | Merge pull request #21919 from akihiro17/remove-requireArthur Nogueira Neves2015-10-081-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused require
| * | | | | | Remove unused requireakihiro172015-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `require 'active_support/core_ext/string/filters'` was added in b3bfa36. However, it is no longer needed from 3ae981814.
* | | | | | | Merge pull request #21906 from scottgonzalez/form-helpersClaudio B.2015-10-081-6/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Minor cleanup for form helpers guide
| * | | | | | Minor cleanup for form helpers guide [ci skip]Scott González2015-10-081-6/+8
| | | | | | |
* | | | | | | Merge pull request #21917 from y-yagi/remove_unused_requireSantiago Pastorino2015-10-081-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unused require
| * | | | | | | remove unused requireyuuji.yaginuma2015-10-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `shellwords` is no longer needed from #20605.
* | | | | | | | Merge pull request #21913 from kamipo/fix_subsecond_precision_supported_versionSean Griffin2015-10-081-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix subsecond precision supported version
| * | | | | | | | Fix subsecond precision supported versionRyuta Kamizono2015-10-081-3/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fractional Seconds supported version is 5.6.4 or higher. http://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html
* | | | | | | | Merge pull request #21891 from ↵Sean Griffin2015-10-081-4/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | AndyLampert/small-csrf-section-readability-improvements Improve readability in CSRF section of guide [ci skip]
| * | | | | | | Improve readability in CSRF section of guideAndy Lampert2015-10-071-4/+3
| | | | | | | |
* | | | | | | | Merge pull request #21686 from kamipo/remove_pk_and_sequence_forAndrew White2015-10-083-31/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove unused `pk_and_sequence_for` in AbstractMysqlAdapter
| * | | | | | | Remove unused `pk_and_sequence_for` in AbstractMysqlAdapterRyuta Kamizono2015-10-083-31/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `pk_and_sequence_for` is implemented for PG and MySQL adapters (not implemented for Sqlite3 adapter). But MySQL adapters are not using `pk_and_sequence_for` already.
* | | | | | | code gardening in transliterate.rbXavier Noria2015-10-071-2/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saw this while doing a review of a patch: * Normalize case and punctuation across comments. * ascii -> ASCII * Since I was on it, some blank lines that visually add some clarity IMO.
* | | | | | Merge pull request #21804 from merhard/mounted_engine_route_fixAndrew White2015-10-074-2/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mounted engine route fix
| * | | | | | Fix mounted engine named routes regressionMatthew Erhard2015-10-074-2/+64
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating the url for a mounted engine through its proxy, the path should be the sum of three parts: 1. Any `SCRIPT_NAME` request header or the value of `ActionDispatch::Routing::RouteSet#relative_url_root`. 2. A prefix (the engine's mounted path). 3. The path of the named route inside the engine. Since commit https://github.com/rails/rails/commit/44ff0313c121f528a68b3bd21d6c7a96f313e3d3, this has been broken. Step 2 has been changed to: 2. A prefix (the value of `ActionDispatch::Routing::RouteSet#relative_url_root` + the engine's mounted path). The value of `ActionDispatch::Routing::RouteSet#relative_url_root` is taken into account in step 1 of the route generation and should be ignored when generating the mounted engine's prefix in step 2. This commit fixes the regression by having `ActionDispatch::Routing::RouteSet#url_for` check `options[:relative_url_root]` before falling back to `ActionDispatch::Routing::RouteSet#relative_url_root`. The prefix generating code then sets `options[:relative_url_root]` to an empty string. This empty string is used instead of `ActionDispatch::Routing::RouteSet#relative_url_root` and avoids the duplicate `relative_url_root` value in the final result. This resolves #20920 and resolves #21459
* | | | | | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the reporter to just read the option. Pass output_inline where needed in tests.
* | | | | | Refactor create_test_file to take a pass option.Kasper Timm Hansen2015-10-071-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | Lets us cut the verbose and straight up duplicated setup in 3 tests down to one line.
* | | | | | Hide Minitest's aggregated results if outputting inline.Kasper Timm Hansen2015-10-072-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd see the failures and errors reported after the run, which is needless, when we've already reported them. Turns: ``` .......................................S....................F This failed bin/rails test test/models/bunny_test.rb:14 .... Finished in 0.100886s, 1020.9583 runs/s, 1001.1338 assertions/s. 2) Failure: BunnyTest#test_something_failing [/Users/kasperhansen/Documents/code/collection_caching_test/test/models/bunny_test.rb:15]: This failed 103 runs, 101 assertions, 1 failures, 0 errors, 1 skips You have skipped tests. Run with --verbose for details. ``` Into: ``` ...................S.......................................F This failed bin/rails test test/models/bunny_test.rb:14 ...................... Finished in 0.069910s, 1473.3225 runs/s, 1444.7143 assertions/s. 103 runs, 101 assertions, 1 failures, 0 errors, 1 skips ```
* | | | | | Merge pull request #21904 from morgoth/missing-test-for-not-modifing-queuesRichard Schneeman2015-10-072-14/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added missing specs for not modifying queues when using AJ test helpers
| * | | | | | Added missing specs for not modifying queues when using AJ test helpersWojciech Wnętrzak2015-10-072-14/+31
| |/ / / / /
* / / / / / Revert "Update asset_pipeline.md"Rafael Mendonça França2015-10-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit afe672185d5eba95f387c46f855ae7a21ea69fa5. Reason: This change was done by mistake. This option is at the `config` object not in the `config.assets`. See https://github.com/rails/rails/blob/cfb371e96a2789790359ec1db779df490fd253d6/railties/lib/rails/application/configuration.rb#L16
* | | | | Merge pull request #21902 from mparramont/patch-1Rafael Mendonça França2015-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix "Esperanto" name
| * | | | | Fix "Esperanto" nameMiguel Parramon2015-10-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Correct spelling is "Esperanto": https://en.wikipedia.org/wiki/Esperanto
* | | | | Merge pull request #21899 from scottgonzalez/layouts-and-rendering-typoRichard Schneeman2015-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in docs
| * | | | | Fix typo in docs [ci skip]Scott González2015-10-071-1/+1
| | | | | |
* | | | | | Merge pull request #21900 from scottgonzalez/contributing-typoRafael Mendonça França2015-10-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix pluralization in docs [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 05:39:15 +0000