aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Include MIT-LICENSE in railties gemBrandon Keepers2015-09-011-1/+1
|/ / / / /
* | | | | Merge pull request #21454 from claudiob/fix-failing-tests-on-guidesRafael Mendonça França2015-09-013-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix: make Travis CI happy about guides again
| * | | | | Fix: make Travis CI happy about guides againclaudiob2015-09-013-0/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests on Rails [are currently failing](https://travis-ci.org/rails/rails/jobs/78255666). The reason is the dependency of Rails master from gems that are currently on GitHub (not on RubyGems) and should be explicitly referenced in the Guides test files.
* | | | | Merge pull request #21453 from claudiob/minimum-sprockets-2Kasper Timm Hansen2015-09-012-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Require sprockets-rails >= 2
| * | | | Require sprockets-rails >= 2claudiob2015-09-012-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/commit/4d157ea8c15186c4903fa83f2dc51a5f78d13a37 Without any specification about the version of sprockets-rails, running a `bundle install` on a brand new app might result in sprockets 0.0.1 being installed. However, the minimum requirement is sprockets-rails 2 (see https://github.com/rails/rails/pull/17752/files)
* | | | Merge pull request #21450 from amitsuroliya/minor_typoKasper Timm Hansen2015-09-011-1/+1
|\ \ \ \ | | | | | | | | | | typo fix [ci skip]
| * | | | typo fix [ci skip]amitkumarsuroliya2015-09-011-1/+1
| | | | | | | | | | | | | | | sub-project's should be sub-projects' at all places
* | | | | Merge pull request #21447 from aditya-kapoor/add-missing-test-amKasper Timm Hansen2015-09-011-0/+14
|\ \ \ \ \ | |/ / / / |/| | | | Add missing test for #17351
| * | | | Add missing test for #17351Aditya Kapoor2015-09-011-0/+14
| | | | |
* | | | | Merge pull request #21444 from etdev/fix-readme-typo-itsKasper Timm Hansen2015-09-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix minor typo in README file
| * | | | | Fix typo in readme fileEric Turner2015-09-011-1/+1
| | | | | |
* | | | | | Fix bug where cookies mutated by request were not persistedeileencodes2015-09-013-0/+17
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With changes made in 8363b8 and ae29142 cookies that are mutated on the request like `cookies.signed = x` were not retained in subsequent tests, breaking cookie authentiation in controller tests. The test added demonstrates the issue. The reason we need to select from non-deleted cookies is because without checking the `@delete_cookies` the `cookie_jar` `@cookies` will send the wrong cookies to be updated. The code must check for `@deleted_cookies` before sending an `#update` with the requests cookie_jar cookies. This follows how the cookie_jar cookies from the request were updated before these changes.
* | | | | Fix failure introduced by #17351 due to the new mocks implementationCarlos Antonio da Silva2015-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was not expecting the new `case_insensitive` option to be passed to `generate_message`, instead of fixing the test we can just not pass this option down since it is specific to the confirmation validator and not necessary for the error message.
* | | | | Merge pull request #21443 from jashank/fix-17351Carlos Antonio da Silva2015-09-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix syntax error introduced by #17351.
| * | | | | Fix syntax error introduced by #17351.Jashank Jeremy2015-09-011-1/+1
| |/ / / /
* / / / / Add master branch to github gems to be able to use local clonesCarlos Antonio da Silva2015-09-012-8/+12
|/ / / /
* | | | Merge pull request #17351 from akshat-sharma/masterRafael Mendonça França2015-09-013-4/+30
|\ \ \ \ | | | | | | | | | | | | | | | Add case_sensitive option for confirmation validation
| * | | | Add case_sensitive option for confirmation validationAkshat Sharma2015-09-013-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case :- 1. In case of email confirmation one needs case insensitive comparison 2. In case of password confirmation one needs case sensitive comparison [ci skip] Update Guides for case_sensitive option in confirmation validation
* | | | | Merge pull request #21416 from lsylvester/cache-helper-with-relationRafael Mendonça França2015-09-013-3/+24
|\ \ \ \ \ | | | | | | | | | | | | cache helper with relation not working as expected
| * | | | | Fix calling cache helper with a relationLachlan Sylvester2015-08-283-3/+24
| | | | | |
* | | | | | Merge pull request #19788 from cmdrclueless/actionpack_http_url_ipv6Rafael Mendonça França2015-09-012-1/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken IPv6 addresses handling
| * | | | | | Fix broken IPv6 addresses handlingBrian Weaver2015-04-162-1/+46
| | | | | | |
* | | | | | | Merge pull request #21298 from rodzyn/remove_dead_codeRafael Mendonça França2015-09-011-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove dead code
| * | | | | | | Remove dead codeMarcin Olichwirowicz2015-08-191-4/+0
| | | | | | | |
* | | | | | | | No need to get the exception variableRafael Mendonça França2015-09-011-6/+4
| | | | | | | |
* | | | | | | | Merge pull request #21318 from yahonda/pr21108Rafael Mendonça França2015-09-012-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Support MySQL 5.7.8 which enables show_compatibility_56=off
| * | | | | | | | Support MySQL 5.7.8 which enables show_compatibility_56=offYasuo Honda2015-08-212-3/+7
| | | | | | | | |
* | | | | | | | | No need CHANGELOG entry for #21421 [ci skip]Rafael Mendonça França2015-09-011-6/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #21421 from leighhalliday/array_inq_toggle_string_symbolRafael Mendonça França2015-09-013-11/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ArrayInquirer to correctly find symbols or strings
| * | | | | | | | | ArrayInquirer to correctly find symbols or stringsLeigh Halliday2015-08-283-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem existed where if your ArrayInquirer values were strings but you checked them using any? with a symbol, it would not find the value. Now it will correctly check whether both the String form or the Symbol form are included in the Array. `
* | | | | | | | | | Inline uneccessary frozen string constantSean Griffin2015-08-311-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are only supporting Ruby 2.2 and later in Rails 5, so we do not need an actual constant here. Additionally, referencing a constant actually does a hash lookup (because constants are not constant in Ruby >_>). This will be marginally (likely immeasurable) faster. It is less ugly.
* | | | | | | | | | Merge pull request #21436 from claudiob/silence-callbacks-warningRafael Mendonça França2015-08-311-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | Silence callback deprecation warning if testing AJ
| * | | | | | | | | Silence callback deprecation warning if testing AJclaudiob2015-08-311-0/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the log returned by running ActiveJob tests is filled with: > DEPRECATION WARNING: Returning `false` in a callback will not implicitly halt a callback chain in the next release of Rails. To explicitly halt a callback chain, please use `throw :abort` instead. For instance, see https://travis-ci.org/rails/rails/builds/77978273 This happens because some setup and teardown methods [like these one](https://github.com/rails/rails/blob/master/activejob/test/cases/async_job_test.rb#L10-L17) invoke other methods like `perform_asynchronously!` that can return `false`, but not with the intention of halting the process if they do. In my opinion, these deprecation warnings can be silenced to have the log result cleaner (especially when browsing for errors).
* | | | | | | | | Merge pull request #21432 from yui-knk/fix/what_change_method_can_reverseSean Griffin2015-08-302-15/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Update what methods `Migration#change` can reverse
| * | | | | | | | | [ci skip] Update what methods `Migration#change` can reverseyui-knk2015-08-312-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Documentations and comments about what methods `Migration#change` can reverse is out of date. For example `change_column_default` is now reversible by this [commit](https://github.com/rails/rails/pull/20018). * Comments about `CommandRecorder` dose not match with Rails Guide. For example `add_foreign_key` is listed only on Rails Guide.
* | | | | | | | | | Merge pull request #21433 from y-yagi/fix_typoKasper Timm Hansen2015-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix typo in method name [ci skip]
| * | | | | | | | | | fix typo in method name [ci skip]yuuji.yaginuma2015-08-301-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #21429 from yui-knk/fix/revert_disable_extensionSean Griffin2015-08-302-1/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Make revert of `disable_extension` to work
| * | | | | | | | | Make revert of `disable_extension` to workyui-knk2015-08-302-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is fix of #11826 which miss to add `disable_extension` to `ReversibleAndIrreversibleMethods`. So `CommandRecorder#method_missing` catches `change_column_default` and @delegate's method is called.
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-08-302-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Capitalize commentsyui-knk2015-08-291-1/+1
| | | | | | | | | |
| * | | | | | | | | [ci skip] Fix file name generated by `rails generate`yui-knk2015-08-241-1/+1
| | | | | | | | | |
* | | | | | | | | | add a method for getting the http auth saltAaron Patterson2015-08-292-2/+6
| | | | | | | | | |
* | | | | | | | | | env to get_header conversionAaron Patterson2015-08-291-1/+1
| | | | | | | | | |
* | | | | | | | | | fixes example for consistency [ci skip]Xavier Noria2015-08-291-3/+3
| | | | | | | | | |
* | | | | | | | | | swaps words [ci skip]Xavier Noria2015-08-291-1/+1
| | | | | | | | | |
* | | | | | | | | | revamps the docs of strong params require [ci skip]Xavier Noria2015-08-291-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References #19565.
* | | | | | | | | | Merge pull request #21423 from y-yagi/rails_test_optsCarlos Antonio da Silva2015-08-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | make `ENV` a required argument
| * | | | | | | | | | make `ENV` a required argumentyuuji.yaginuma2015-08-291-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #21420 from akihiro17/renderingRafael Mendonça França2015-08-282-3/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Set the content-type to `text/html` if the options[:html] is true
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 00:48:53 +0000