Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21868 from tanmay3011/fix_time_class_documentation | Vijay Dev | 2015-10-05 | 1 | -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 Sinha | 2015-10-05 | 1 | -3/+3 |
| | | | | | | | | return floating pointnumber | ||||
* | | Merge pull request #21857 from cllns/fix-myspace-example-wording | Claudio B. | 2015-10-04 | 1 | -5/+3 |
|\ \ | | | | | | | Update text on CSS Injection | ||||
| * | | Update text on CSS Injection / Myspace | Sean Collins | 2015-10-03 | 1 | -5/+3 |
| | | | | | | | | | | | | [skip ci] | ||||
* | | | Merge pull request #21866 from tanmay3011/fix_documentation | Sean Griffin | 2015-10-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix Time.now format in documentation [ci skip] | ||||
| * | | | Fix Time.now format in documentation | Tanmay Sinha | 2015-10-04 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #21863 from tanmay3011/use_applications_year | Sean Griffin | 2015-10-04 | 1 | -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 Sinha | 2015-10-04 | 1 | -1/+1 |
| |/ / | | | | | | | | | | application's time zone | ||||
* | | | Merge pull request #21848 from yui-knk/test_suppress_warnings | Sean Griffin | 2015-10-04 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | Suppress warnings of `assigned but unused variable` | ||||
| * | | | Suppress warnings of `assigned but unused variable` | yui-knk | 2015-10-03 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-10-04 | 20 | -27/+31 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | [ci skip] Fix comment | yui-knk | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | `alias :migrations_path= :migrations_paths=`, so `migrations_path = some_string` is correct. | ||||
| * | | | [ci skip] default_normalization_form accessing from Unicode | Gaurav Sharma | 2015-09-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Revert "proper raise ArgumentError, divided large text new line" | Rafael Mendonça França | 2015-09-28 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | This reverts commit 4147ab730e807f622e5260a5f876749ff41fef26. | ||||
| * | | | adding basic change_column and remove_columns in CommandRecorder ↵ | Gaurav Sharma | 2015-09-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | documentations [ci skip] | ||||
| * | | | proper raise ArgumentError, divided large text new line | Gaurav Sharma | 2015-09-29 | 2 | -4/+4 |
| | | | | |||||
| * | | | Add missing punctuation mark to all ActionMailer docs [ci skip] | amitkumarsuroliya | 2015-09-28 | 5 | -12/+12 |
| | | | | |||||
| * | | | Renamed ‘Return’ to ‘Returns’ [ci skip] | Ronak Jangir | 2015-09-28 | 7 | -9/+9 |
| | | | | |||||
| * | | | Add a missing period to ActionMailer Base docs [ci skip] | amitkumarsuroliya | 2015-09-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Fix document of `ActionController::RequestForgeryProtection` | yui-knk | 2015-09-28 | 1 | -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-knk | 2015-09-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add a missing period to layouts_and_rendering.md [ci skip] | Juanito Fatas | 2015-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Documentation typo | Akira Matsuda | 2015-09-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #21861 from jeremy/rack-add-header | Jeremy Daer | 2015-10-03 | 6 | -34/+37 |
|\ \ \ \ | | | | | | | | | | | Introduce `Headers#add`. Move `Response#add_header` upstream. | ||||
| * | | | | Introduce `Headers#add`. Move `Response#add_header` upstream. | Jeremy Daer | 2015-10-03 | 6 | -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 f849cfe36c585fbc58c4a5fd91b0ae1571d38bcb | Jeremy Daer | 2015-10-03 | 1 | -4/+0 |
| | | | | |||||
* | | | | YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with ↵ | Jeremy Daer | 2015-10-03 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | fixes for warnings and circular require | ||||
* | | | | Revert "removing Rack::Runtime from the default stack." | Aaron Patterson | 2015-10-03 | 7 | -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_doc | Eileen M. Uchitelle | 2015-10-03 | 5 | -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-03 | 5 | -5/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #21855 from acapilleri/save_perf | Sean Griffin | 2015-10-03 | 2 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Add Singleton in NullMutationTracker class | ||||
| * | | | | Add Singleton in NullMutationTracker class | acapilleri | 2015-10-03 | 2 | -1/+3 |
| |/ / / | | | | | | | | | | | | | to reduce allocation of same object | ||||
* | | | | Merge pull request #21853 from amitsuroliya/deprecated_string_middleware | Kasper Timm Hansen | 2015-10-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fixed deprecated string to specify the middleware [ci skip] | ||||
| * | | | Fixed deprecated string to specify the middleware [ci skip] | amitkumarsuroliya | 2015-10-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #21852 from ↵ | Kasper Timm Hansen | 2015-10-03 | 3 | -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` option | Wojciech Wnętrzak | 2015-10-03 | 3 | -1/+23 |
|/ / / | |||||
* | | | Merge pull request #21851 from y-yagi/use_class_to_specify_middleware | Kasper Timm Hansen | 2015-10-03 | 2 | -6/+6 |
|\ \ \ | |_|/ |/| | | use class to specify the middleware [ci skip] | ||||
| * | | use class to specify the middleware [ci skip] | yuuji.yaginuma | 2015-10-03 | 2 | -6/+6 |
| | | | | | | | | | | | | using string for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a | ||||
* | | | removing Rack::Runtime from the default stack. | Aaron Patterson | 2015-10-02 | 7 | -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-nodoc | Rafael Mendonça França | 2015-10-02 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Do not document private methods in AJ::TestHelper | ||||
| * | | | Do not document private methods in AJ::TestHelper | Wojciech Wnętrzak | 2015-10-02 | 1 | -5/+5 |
|/ / / | | | | | | | | | | [CI skip] | ||||
* | | | Merge pull request #21809 from yui-knk/fix_doc_am_serialization | Sean Griffin | 2015-10-02 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | [ci skip] Fix explanation of `ActiveModel::Serialization` | ||||
| * | | | [ci skip] Fix explanation of `ActiveModel::Serialization` | yui-knk | 2015-10-02 | 1 | -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-scopes | Sean Griffin | 2015-10-02 | 3 | -10/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unused scopes | ||||
| * | | | | Remove unused scopes | Andy Atkinson | 2015-10-01 | 3 | -10/+0 |
| | | | | | |||||
* | | | | | Build the `AttributeMutationTracker` lazily | Sean Griffin | 2015-10-02 | 2 | -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 White | 2015-10-02 | 2 | -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 digits | Fumiaki MATSUSHIMA | 2015-09-30 | 2 | -7/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #21539 from tgxworld/parameters_not_sanitized | Sean Griffin | 2015-10-02 | 4 | -7/+64 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix AC::Parameters not being sanitized for query methods. | ||||
| * | | | | | | Fix AC::Parameters not being sanitized for query methods. | Guo Xiang Tan | 2015-10-02 | 4 | -7/+64 |
| | |_|_|/ / | |/| | | | |