Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | bundle u rake to 12.0.0 | Akira Matsuda | 2016-12-24 | 1 | -1/+1 | |
| | ||||||
* | Privatize unneededly protected methods in Active Support tests | Akira Matsuda | 2016-12-24 | 7 | -8/+8 | |
| | ||||||
* | Privatize unneededly protected methods in Railties tests | Akira Matsuda | 2016-12-24 | 6 | -6/+6 | |
| | ||||||
* | Privatize unneededly protected methods in Active Record tests | Akira Matsuda | 2016-12-24 | 11 | -11/+11 | |
| | ||||||
* | Privatize unneededly protected methods in Action Cable tests | Akira Matsuda | 2016-12-24 | 3 | -3/+3 | |
| | ||||||
* | Privatize unneededly protected methods in Active Job tests | Akira Matsuda | 2016-12-24 | 2 | -2/+2 | |
| | ||||||
* | Privatize unneededly protected methods in Action Mailer tests | Akira Matsuda | 2016-12-24 | 3 | -3/+3 | |
| | ||||||
* | Privatize unneededly protected methods in Action Pack tests | Akira Matsuda | 2016-12-23 | 10 | -22/+20 | |
| | ||||||
* | Privatize unneededly protected methods in Action View tests | Akira Matsuda | 2016-12-23 | 5 | -5/+5 | |
| | ||||||
* | Describe what we are protecting | Akira Matsuda | 2016-12-23 | 37 | -0/+78 | |
| | ||||||
* | Unneeded attr_accessor with side effects | Akira Matsuda | 2016-12-23 | 2 | -8/+0 | |
| | ||||||
* | Merge pull request #27424 from utilum/fix_complex_and_rational_are_duplicable | Kasper Timm Hansen | 2016-12-22 | 3 | -2/+27 | |
|\ | | | | | Fix duplicable? for Complex and Rational | |||||
| * | Fix Complex and Rational are duplicable? | utilum | 2016-12-21 | 3 | -2/+27 | |
| | | | | | | | | See [this test](https://gist.github.com/utilum/78918f1b64f8b61ee732cb266db7c43a). | |||||
* | | Merge pull request #27431 from y-yagi/quiet_generator_log_in_test | Kasper Timm Hansen | 2016-12-22 | 1 | -1/+1 | |
|\ \ | | | | | | | quiet generators log in test | |||||
| * | | quiet generators log in test | yuuji.yaginuma | 2016-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This quiet the following log. ``` create app/mailers/notifier_mailer.rb invoke erb create app/views/notifier_mailer identical app/views/layouts/mailer.text.erb identical app/views/layouts/mailer.html.erb create app/views/notifier_mailer/foo.text.erb create app/views/notifier_mailer/foo.html.erb invoke test_unit create test/mailers/notifier_mailer_test.rb create test/mailers/previews/notifier_mailer_preview.rb ``` | |||||
* | | | Merge pull request #27430 from kirs/aj-warning | Matthew Draper | 2016-12-22 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Remove warning in ActiveJob | |||||
| * | | Remove warning in ActiveJob | Kir Shatrov | 2016-12-21 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | Currently it causes: ``` activejob/Rakefile:5: warning: already initialized constant ACTIVEJOB_ADAPTERS ``` | |||||
* | | Merge pull request #27427 from rails/binary-params | Aaron Patterson | 2016-12-21 | 6 | -54/+56 | |
|\ \ | | | | | | | Document and update API for `skip_parameter_encoding` | |||||
| * | | updating docs | Aaron Patterson | 2016-12-21 | 1 | -0/+4 | |
| | | | ||||||
| * | | Document and update API for `skip_parameter_encoding` | Aaron Patterson | 2016-12-21 | 6 | -54/+52 | |
|/ / | | | | | | | | | | | | | | | This commit changes `parameter_encoding` to `skip_parameter_encoding`. `skip_parameter_encoding` will set encoding on all parameters to ASCII-8BIT for a given action on a particular controller. This allows the controller to handle data when the encoding of that data is unknown, for example file systems or truly binary parameters. | |||||
* / | fix typo in getting_started [ci skip] (#27423) | yachibit | 2016-12-21 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #27355 from yukideluxe/fixtures-deleted-tables | Kasper Timm Hansen | 2016-12-21 | 6 | -3/+28 | |
|\ | | | | | fix fixtures loading for models with same table names in different databases | |||||
| * | fix #create_fixtures when equal table names in different databases | Julia Lopez | 2016-12-21 | 6 | -3/+28 | |
|/ | ||||||
* | Fix grammar in asset tag documentation | eileencodes | 2016-12-20 | 1 | -1/+1 | |
| | | | | | Updated the docmentation because "options supports" is not grammatically correct. | |||||
* | Improve `javascript_include_tag` documentation (#27403) | Pablo Ifrán | 2016-12-20 | 1 | -5/+24 | |
| | | | | Add all the available options, and correct the samples of the `javascript_include_tag`. | |||||
* | Merge pull request #27412 from maclover7/jm-ruby-24 | Kasper Timm Hansen | 2016-12-20 | 3 | -5/+6 | |
|\ | | | | | Ruby 2.4 compatibility | |||||
| * | Add Ruby v2.4.0-rc1 to Travis matrix | Jon Moss | 2016-12-20 | 1 | -0/+1 | |
| | | ||||||
| * | Limit length of secret being passed | Jon Moss | 2016-12-20 | 1 | -3/+3 | |
| | | | | | | | | Very similar to PR #25758, see more in depth reasoning there. | |||||
| * | Bump concurrent-ruby and sprockets | Jon Moss | 2016-12-20 | 1 | -2/+2 | |
|/ | | | | Bumped to Ruby 2.4 compatible versions | |||||
* | [ci skip] Update initialization guide samples. | Kasper Timm Hansen | 2016-12-20 | 1 | -81/+84 | |
| | | | | Rewrite bits and pieces to mention the command infrastructure. | |||||
* | Merge pull request #27414 from matthewd/fix-xml-vs-html-assertion | Matthew Draper | 2016-12-21 | 1 | -12/+12 | |
|\ | | | | | Revise the "XML is not HTML" test | |||||
| * | Revise the "XML is not HTML" test | Matthew Draper | 2016-12-20 | 1 | -12/+12 | |
| | | | | | | | | | | | | It was depending on a side-effect of the old html-scanner, so was no longer proving what it intended to. Instead, assert more directly about the resulting observable difference. | |||||
* | | Merge pull request #27408 from matthewd/charset-fix | Matthew Draper | 2016-12-20 | 3 | -5/+14 | |
|\ \ | | | | | | | Only default the response charset when it is first set | |||||
| * | | Only default the response charset when it is first set | Matthew Draper | 2016-12-20 | 3 | -5/+14 | |
| |/ | | | | | | | | | If it is explicitly cleared (e.g., response.sending_file = true), then we should not try to set it again. | |||||
* | | Merge pull request #27146 from maclover7/jm-fix-27145 | Eileen M. Uchitelle | 2016-12-19 | 2 | -2/+10 | |
|\ \ | | | | | | | Do not clear HTTP_COOKIES header after request | |||||
| * | | Do not clear HTTP_COOKIES header after request | Jon Moss | 2016-12-11 | 2 | -2/+10 | |
| | | | ||||||
* | | | Merge pull request #27391 from y-yagi/make_work_test_tool_with_line_filter | Kasper Timm Hansen | 2016-12-19 | 1 | -0/+3 | |
|\ \ \ | | | | | | | | | make work bin/test scripts with line filter | |||||
| * | | | make work bin/test scripts with line filter | yuuji.yaginuma | 2016-12-17 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | `Rails::LineFiltering` is not automatically loaded, need to load it explicitly. Ref: 797f1dd, b6f935b | |||||
* | | | | Merge pull request #27407 from cemonti/master | Eileen M. Uchitelle | 2016-12-19 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Fix typo in channel generator usage message | |||||
| * | | | | Fix typo in channel generator usage message | Carlos Eduardo Monti | 2016-12-19 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #27365 from baweaver/patch-1 | Eileen M. Uchitelle | 2016-12-19 | 1 | -0/+8 | |
|\ \ \ \ | | | | | | | | | | | Add note on defaults block option | |||||
| * | | | | Add note on defaults block option | Brandon Weaver | 2016-12-14 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | When I was looking for how to default the entire routes file to JSON I could only find the postfix option. It was mentioned on IRC that you could do this with a block as well and I had not found it in the documentation. | |||||
* | | | | | Merge pull request #27388 from maclover7/jm-argv | Eileen M. Uchitelle | 2016-12-19 | 2 | -0/+17 | |
|\ \ \ \ \ | | | | | | | | | | | | | `ARGV.shift` before calling Rails generators | |||||
| * | | | | | `ARGV.shift` before calling Rails generators | Jon Moss | 2016-12-17 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gems like rspec-rails depend on `ARGV` being shifted, and `scaffold` (for example) not being the first item in `ARGV`. This should allow rspec-rails to be passing on Rails master. | |||||
* | | | | | | Merge pull request #27400 from kamipo/remove_useless_test_supports_primary_key | Eileen M. Uchitelle | 2016-12-19 | 1 | -6/+0 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Remove useless `test_supports_primary_key` | |||||
| * | | | | | Remove useless `test_supports_primary_key` | Ryuta Kamizono | 2016-12-19 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_primary_key?` method is defined in `AbstractAdapter` so does not raise any errors. | |||||
* | | | | | | `protected` here doesn't protect anything | Akira Matsuda | 2016-12-19 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | there aren't any instance method defined in this class | |||||
* | | | | | | Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branch | Matthew Draper | 2016-12-19 | 1 | -6/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Consolidate duplicated elsif branch | |||||
| * | | | | | Consolidate duplicated elsif branch | Ryuta Kamizono | 2016-12-19 | 1 | -6/+1 | |
|/ / / / / | ||||||
* | | | | | fields: support attributes not on model. | Kasper Timm Hansen | 2016-12-18 | 2 | -0/+37 | |
| | | | | | | | | | | | | | | | | | | | | Ensure the support works like form_with. |