aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #21868 from tanmay3011/fix_time_class_documentationVijay Dev2015-10-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will al…
| * | | | | | | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will always ↵Tanmay Sinha2015-10-051-3/+3
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return floating pointnumber
* | | | | | | | | | | | | Merge pull request #21857 from cllns/fix-myspace-example-wordingClaudio B.2015-10-041-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Update text on CSS Injection
| * | | | | | | | | | | | Update text on CSS Injection / MyspaceSean Collins2015-10-031-5/+3
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | | | | Merge pull request #21866 from tanmay3011/fix_documentationSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Time.now format in documentation [ci skip]
| * | | | | | | | | | | | Fix Time.now format in documentationTanmay Sinha2015-10-041-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #21863 from tanmay3011/use_applications_yearSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use #current instead of #now to prevent zone issues and use new ruby …
| * | | | | | | | | | | | Use Time#current instead of Time#now to prevent zone issue inorder to use ↵Tanmay Sinha2015-10-041-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application's time zone
* | | | | | | | | | | | Merge pull request #21848 from yui-knk/test_suppress_warningsSean Griffin2015-10-041-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress warnings of `assigned but unused variable`
| * | | | | | | | | | | | Suppress warnings of `assigned but unused variable`yui-knk2015-10-031-3/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-0420-27/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ci skip] Fix commentyui-knk2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `alias :migrations_path= :migrations_paths=`, so `migrations_path = some_string` is correct.
| * | | | | | | | | | | [ci skip] default_normalization_form accessing from UnicodeGaurav Sharma2015-09-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Revert "proper raise ArgumentError, divided large text new line"Rafael Mendonça França2015-09-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4147ab730e807f622e5260a5f876749ff41fef26.
| * | | | | | | | | | | adding basic change_column and remove_columns in CommandRecorder ↵Gaurav Sharma2015-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentations [ci skip]
| * | | | | | | | | | | proper raise ArgumentError, divided large text new lineGaurav Sharma2015-09-292-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Add missing punctuation mark to all ActionMailer docs [ci skip]amitkumarsuroliya2015-09-285-12/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-287-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Add a missing period to ActionMailer Base docs [ci skip]amitkumarsuroliya2015-09-281-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | [ci skip] Fix document of `ActionController::RequestForgeryProtection`yui-knk2015-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add `end` to end of class definition * add a blank line between explanation and example code
| * | | | | | | | | | | [ci skip] Add `:` before code blocks.yui-knk2015-09-251-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add a missing period to layouts_and_rendering.md [ci skip]Juanito Fatas2015-09-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Documentation typoAkira Matsuda2015-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge pull request #21861 from jeremy/rack-add-headerJeremy Daer2015-10-036-34/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce `Headers#add`. Move `Response#add_header` upstream.
| * | | | | | | | | | | | Introduce `Headers#add`. Move `Response#add_header` upstream.Jeremy Daer2015-10-036-34/+37
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `ActionDispatch::Http::Headers#add` to add a value to a multivalued header. * Move `Response#add_header` upstream: https://github.com/rack/rack/pull/957 * Match upstream `Response#have_header?` -> `#has_header?` name change.
* | | | | | | | | | | | Missed Gemfile change in f849cfe36c585fbc58c4a5fd91b0ae1571d38bcbJeremy Daer2015-10-031-4/+0
| | | | | | | | | | | |
* | | | | | | | | | | | YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with ↵Jeremy Daer2015-10-031-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for warnings and circular require
* | | | | | | | | | | | Revert "removing Rack::Runtime from the default stack."Aaron Patterson2015-10-037-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 37423e4ff883ad5584bab983aceb4b2b759a1fd8. Jeremy is right that we shouldn't remove this. The fact is that many engines are depending on this middleware to be in the default stack. This ties our hands and forces us to keep the middleware in the stack so that engines will work. To be extremely clear, I think this is another smell of "the rack stack" that we have in place. When manipulating middleware, we should have meaningful names for places in the req / res lifecycle **not** have engines depend on a particular constant be in a particular place in the stack. This is a weakness of the API that we have to figure out a way to address before removing the constant. As far as timing attacks are concerned, we can reduce the granularity such that it isn't useful information for hackers, but is still useful for developers.
* | | | | | | | | | | | Merge pull request #21860 from vngrs/wrong_usage_of_a_in_docEileen M. Uchitelle2015-10-035-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong usage of 'a' in docs fixed [ci skip]
| * | | | | | | | | | | | Wrong usage of 'a' in docs fixed [ci skip]Mehmet Emin İNAÇ2015-10-035-5/+5
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #21855 from acapilleri/save_perfSean Griffin2015-10-032-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add Singleton in NullMutationTracker class
| * | | | | | | | | | | | Add Singleton in NullMutationTracker classacapilleri2015-10-032-1/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to reduce allocation of same object
* | | | | | | | | | | | Merge pull request #21853 from amitsuroliya/deprecated_string_middlewareKasper Timm Hansen2015-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fixed deprecated string to specify the middleware [ci skip]
| * | | | | | | | | | | Fixed deprecated string to specify the middleware [ci skip]amitkumarsuroliya2015-10-031-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #21852 from ↵Kasper Timm Hansen2015-10-033-1/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/support-array-in-assert_enqueued_jobs-for-only-option Support passing array to `assert_enqueued_jobs` in `:only` option
| * | | | | | | | | | | Support passing array to `assert_enqueued_jobs` in `:only` optionWojciech Wnętrzak2015-10-033-1/+23
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #21851 from y-yagi/use_class_to_specify_middlewareKasper Timm Hansen2015-10-032-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | use class to specify the middleware [ci skip]
| * | | | | | | | | | use class to specify the middleware [ci skip]yuuji.yaginuma2015-10-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using string for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a
* | | | | | | | | | | removing Rack::Runtime from the default stack.Aaron Patterson2015-10-027-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The runtime header is a potential target for timing attacks since it returns the amount of time spent on the server (eliminating network speed). Total time is also not accurate for streaming responses. The middleware can be added back via: ```ruby config.middleware.ues ::Rack::Runtime ```
* | | | | | | | | | | Merge pull request #21842 from morgoth/mark-private-methods-as-nodocRafael Mendonça França2015-10-021-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not document private methods in AJ::TestHelper
| * | | | | | | | | | | Do not document private methods in AJ::TestHelperWojciech Wnętrzak2015-10-021-5/+5
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CI skip]
* | | | | | | | | | | Merge pull request #21809 from yui-knk/fix_doc_am_serializationSean Griffin2015-10-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix explanation of `ActiveModel::Serialization`
| * | | | | | | | | | | [ci skip] Fix explanation of `ActiveModel::Serialization`yui-knk2015-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This explanation was change by https://github.com/rails/rails/commit/7a27de2b. This change reversed the including module (`ActiveModel::Serializers::JSON`) and the included module (`ActiveModel::Serialization`) by mistake.
* | | | | | | | | | | | Merge pull request #21839 from andyatkinson/remove-unusued-scopesSean Griffin2015-10-023-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused scopes
| * | | | | | | | | | | | Remove unused scopesAndy Atkinson2015-10-013-10/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Build the `AttributeMutationTracker` lazilySean Griffin2015-10-022-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reads, we never need to construct this object. The double `defined?` check is to avoid errors in tests
* | | | | | | | | | | | | Merge pull request #20600 from ↵Andrew White2015-10-022-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/xmlschema-should-display-more-than-6-digits TimeWithZone#xmlschema should be able to display more than 6 digits
| * | | | | | | | | | | | | TimeWithZone#xmlschema should be able to display more than 6 digitsFumiaki MATSUSHIMA2015-09-302-7/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #21539 from tgxworld/parameters_not_sanitizedSean Griffin2015-10-024-7/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix AC::Parameters not being sanitized for query methods.
| * | | | | | | | | | | | | | Fix AC::Parameters not being sanitized for query methods.Guo Xiang Tan2015-10-024-7/+64
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 05:38:53 +0000