aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * Fix pluralization in docs [ci skip]Scott González2015-10-071-1/+1
|/
* Merge pull request #21895 from abhishekjain16/doc_fixKasper Timm Hansen2015-10-071-1/+1
|\ | | | | [ci skip] fix typo
| * [ci skip] fix typoAbhishek Jain2015-10-071-1/+1
|/
* Merge pull request #20983 from jameskerr/mailer-preview-urlArthur Nogueira Neves2015-10-062-1/+21
|\ | | | | Update the URL when changing mailer preview formats
| * Update the URL when changing mailer preview formatsJames Kerr2015-10-062-1/+21
| | | | | | | | | | | | Added javascript to update the URL on mailer previews with the currently selected email format. Reloading the page now keeps you on your selected format rather than going back to the default html version.
* | use methods for accessing the cache control headersAaron Patterson2015-10-063-7/+10
| | | | | | | | | | Use the methods rack provides so we don't have to worry about the exact header key.
* | etag header is in Rack, so use it's response methodsAaron Patterson2015-10-062-7/+3
|/ | | | | Rack implements the Etag header manipulation methods, so we can use those instead of ours.
* Merge pull request #21869 from jeremy/mime-constant-deprecationJeremy Daer2015-10-0632-214/+193
|\ | | | | Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compat
| * Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compatJeremy Daer2015-10-0632-214/+193
|/ | | | | | | | | | | | | | | | | Rails 4.x and earlier didn't support `Mime::Type[:FOO]`, so libraries that support multiple Rails versions would've had to feature-detect whether to use `Mime::Type[:FOO]` or `Mime::FOO`. `Mime[:foo]` has been around for ages to look up registered MIME types by symbol / extension, though, so libraries and plugins can safely switch to that without breaking backward- or forward-compatibility. Note: `Mime::ALL` isn't a real MIME type and isn't registered for lookup by type or extension, so it's not available as `Mime[:all]`. We use it internally as a wildcard for `respond_to` negotiation. If you use this internal constant, continue to reference it with `Mime::ALL`. Ref. efc6dd550ee49e7e443f9d72785caa0f240def53
* Merge pull request #21887 from abhishekjain16/doc_fixKasper Timm Hansen2015-10-062-2/+2
|\ | | | | Fix usage of word alternatively in docs [ci skip]
| * Fix usage of word alternatively in docs [ci skip]Abhishek Jain2015-10-062-2/+2
| |
* | Merge pull request #21888 from tanmay3011/fix-grammarYves Senn2015-10-068-9/+9
|\ \ | |/ |/| [ci skip] Change 'an URL' to 'a URL' as URL doesn't have a vowel sound
| * [ci skip] Change 'an URL' to 'a URL' as URL doesn't have a vowel soundtanmay30112015-10-068-9/+9
|/
* Implement equality comparison on `AttributeSet` and friendsSean Griffin2015-10-063-11/+33
| | | | | | | Any gems or libraries which do work with serialization or YAML will ultimately need to compare these objects (albeit indirectly) to ensure correctness. These will likely never get used internally (as they're slow), but we should still expose them for others.
* Merge pull request #21879 from abhishekjain16/doc_fixAndrew White2015-10-061-1/+1
|\ | | | | Fix ActionView changelog documentation [ci skip]
| * Fix ActionView changelog documentation [ci skip]Abhishek Jain2015-10-061-1/+1
| |
* | Merge pull request #21881 from b1nary/active_model_doc_fixYves Senn2015-10-061-1/+1
|\ \ | |/ |/| use ActiveModel::Naming module instead of Model [ci skip]
| * use ActiveModel::Naming module instead of Model [ci skip]Roman Pramberger2015-10-061-1/+1
|/ | | | | Use the documented module instead of ActiveModel::Model. This makes the example more focused.
* Merge pull request #21877 from amitsuroliya/unused_block_argumentArthur Nogueira Neves2015-10-051-1/+1
|\ | | | | Remove unused block argument
| * Remove unused block argumentamitkumarsuroliya2015-10-061-1/+1
|/
* Merge pull request #21876 from kentendo/masterSean Griffin2015-10-051-1/+1
|\ | | | | Update asset_pipeline.md [ci skip]
| * Update asset_pipeline.mdkentendo2015-10-051-1/+1
| |
* | render should return a stringAaron Patterson2015-10-051-1/+1
|/
* move file sending to the response objectAaron Patterson2015-10-056-30/+50
| | | | | | | Just a slight refactor that delegates file sending to the response object. This gives us the advantage that if a webserver (in the future) provides a response object that knows how to do accelerated file serving, it can implement this method.
* Merge pull request #21872 from kirs/chore/attributes-cleanupSean Griffin2015-10-051-3/+0
|\ | | | | No need to declare ActiveRecord::Attributes::Type
| * No need to declare ActiveRecord::Attributes::TypeKir Shatrov2015-10-051-3/+0
| |
* | Merge pull request #21796 from dv/docs-change-to-parse-nested-queryEileen M. Uchitelle2015-10-051-7/+0
|\ \ | | | | | | Change "parse_query" to "parse_nested_query"
| * | Remove TIP on parse_queryDavid Verhasselt2015-10-051-7/+0
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #20098 from hanachin/add_ability_to_translate_documents.yamlXavier Noria2015-10-052-2/+2
|\ \ \ | | | | | | | | Add ability to translate rails guides documents.yaml
| * | | concatenate @lang if @lang is presence to avoid useless slashSeiei Miyagi2015-10-051-1/+1
| | | |
| * | | Add ability to translate rails guides documents.yamlSeiei Miyagi2015-10-052-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some translations of rails guides has their own documents.yaml, for example Japanese: https://github.com/yasslab/railsguides.jp/blob/japanese/guides/source/documents.yaml Traditional Chinese: https://github.com/docrails-tw/guides/blob/master/rails_guides/helpers.rb#L21,L27 https://github.com/docrails-tw/guides/blob/master/source/documents_zh-TW.yaml The [Translating Rails Guides](https://github.com/rails/docrails/wiki/translating-rails-guides) says > Copy the contents of guides/source into your own language directory and translate them. So that sounds ok to copy guides/source/documents.yaml into language specific directly and translating them like other markdown files.
* | | Merge pull request #21854 from morgoth/fix-serializing-at-option-in-aj-matchersYves Senn2015-10-053-8/+38
|\ \ \ | | | | | | | | | | | | Fixed serializing `:at` option for `assert_eqnueued_with` and `assert_performed_with`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 01:35:00 +0000