aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21473 from akihiro17/remove-unused-requireCarlos Antonio da Silva2015-09-031-1/+0
|\ | | | | Remove unnecessary require in associations_test.rb
| * Remove unnecessary require in associations_test.rbakihiro172015-09-031-1/+0
| |
* | Merge pull request #21481 from prakashlaxkar/remove_configCarlos Antonio da Silva2015-09-032-4/+0
|\ \ | | | | | | Removed unused config from activemodel test
| * | Removed unused config filePrakash Laxkar2015-09-032-4/+0
| | |
* | | Merge pull request #21483 from justanshulsharma/add-ip6-addressEileen M. Uchitelle2015-09-031-1/+1
|\ \ \ | |/ / |/| | [ci skip] Added localhost IPv6
| * | [ci skip] Added localhost IPv6Anshul Sharma2015-09-031-1/+1
| | |
* | | Merge pull request #21475 from y-yagi/add_description_of_return_valueGodfrey Chan2015-09-021-1/+1
|\ \ \ | |_|/ |/| | add a description of the return value that was missing [ci skip]
| * | add a description of the return value that was missing [ci skip]yuuji.yaginuma2015-09-031-1/+1
|/ /
* | docs, make `blank?` behavior clear. Closes #21468. [ci skip]Yves Senn2015-09-021-2/+2
| |
* | Don't allocate a bunch of strings in `Relation::Merger`Sean Griffin2015-09-021-4/+8
| | | | | | | | | | | | Since the strings are dynamically computed from a constant, the actual strings we're creating are a known set. We can compute them ahead of time, and reduce the number of allocations in that method.
* | Merge pull request #21467 from yui-knk/doc/subscribeZachary Scott2015-09-021-2/+2
|\ \ | | | | | | [ci skip] Add description about which object
| * | [ci skip] Add description about which objectyui-knk2015-09-021-2/+2
| | | | | | | | | | | | `ActiveSupport::Notifications.subscribe` expects as second parameter.
* | | Fix route creation when format is a blank stringeileencodes2015-09-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit bff61ba, while reducing allocations, caused a regression when an empty format is passed to a route. This can happen in cases where you're using an anchor tag, for example: `https://example.com/parent/575256966.#child_1032289285`. Because of this change `format` was getting sent in `parameterized_parts` when previously it was not included. This resulted in blank `format`'s being returned as `.` when if there was an extension included it would be `.extension`. Since there was no extension this caused incorrect URL's. The test shows this would result in `/posts/show/1.` instead of `/posts/show/1` which causes bad urls since the format is not present.
* | | Merge pull request #21462 from ignatiusreza/dev_dep_docClaudio B.2015-09-021-1/+1
|\ \ \ | | | | | | | | fix invalid package name for libmysqlclient-dev mentioned in development_dependencies_install guide
| * | | [ci skip] fix invalid package name for libmysqlclient-devIgnatius Reza2015-09-021-1/+1
|/ / / | | | | | | | | | tested on Ubuntu Desktop 15.04
* | | Merge pull request #21451 from kishore-mohan/typo-helper-descriptionSean Griffin2015-09-012-3/+3
|\ \ \ | | | | | | | | Typo on helper description and action_controller_overview
| * | | typo "description not clear corrected with proper description and ↵kishore-mohan2015-09-022-3/+3
|/ / / | | | | | | | | | action_controller_overview file Rails' -> Rails" [ci skip]
* | | Merge pull request #21456 from rodzyn/clean_requiresRafael Mendonça França2015-09-017-13/+2
|\ \ \ | | | | | | | | Remove not used requires
| * | | Remove not used requiresMarcin Olichwirowicz2015-09-017-13/+2
| | | |
* | | | Respect scale of the column in the Decimal typeRafael Mendonça França2015-09-013-1/+36
| | | | | | | | | | | | | | | | [Rafael Mendonça França + Jean Boussier]
* | | | Add windows version of nokogiriRafael Mendonça França2015-09-011-0/+4
| | | |
* | | | Merge pull request #21455 from bkeepers/railties-licenseRafael Mendonça França2015-09-011-1/+1
|\ \ \ \ | | | | | | | | | | Include MIT-LICENSE in railties gem
| * | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 11:56:05 +0000