aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* modify to pass the correct argument to the test runner from rakeyuuji.yaginuma2015-09-082-6/+15
| | | | | | | | test runner sets file to be tested in plugin_rails_options, but in plugin_rails_options, processing has been made to the argument of the actual command rather than the argument of Minitest.run. For example, if you run `./bin rake db:migrate test`, the options[:patterns], `db:migrate test` was incorrectly set.
* raise LoadError when a non-existent file or directory is specified to the ↵yuuji.yaginuma2015-09-072-1/+6
| | | | | | | | test runner Currently, if a file or directory that does not exist was specified in the test runner, that argument is ignored. This commit has been modified to cause an error if there is no file or directory.
* Merge pull request #21514 from ronakjangir47/remove_extra_theXavier Noria2015-09-062-2/+2
|\ | | | | Removed Extra ‘the’ [ci skip]
| * Removed Extra ‘the’ [ci skip]Ronak Jangir2015-09-062-2/+2
| |
* | Use ERB::Utils to percent encode `hfvalue` parts of mailtoAaron Patterson2015-09-052-5/+5
|/ | | | | | | | `hfvalue` parts should always be percent encoded, so lets do that! Revert "use path escaping for email addresses" This reverts commit 21ffef38a5dc5a6a21f7e841aecab5b51f4fd185.
* Merge pull request #21506 from rodzyn/remove_mocha_part_3Kasper Timm Hansen2015-09-058-90/+132
|\ | | | | Remove mocha from ActionPack tests
| * Remove mocha from ActionPack testsMarcin Olichwirowicz2015-09-058-90/+132
|/
* implement abstract store methodsAaron Patterson2015-09-044-8/+8
| | | | converts old ID methods to the new abstract store methods in Rack
* stop using deprecated Abstract::ID classAaron Patterson2015-09-045-5/+5
|
* stop inheriting from Rack::RequestAaron Patterson2015-09-0412-22/+24
| | | | | | Just include the modules necessary in the Request object to implement the things we need. This should make it easier to build delegate request objects because the API is smaller
* Merge pull request #21504 from ioquatix/patch-1Sean Griffin2015-09-041-1/+1
|\ | | | | #where fails if opts.responds_to?(:==) unexpectedly
| * #where fails if opts.responds_to?(:==) unexpectedlySamuel Williams2015-09-051-1/+1
|/ | | Sometimes opts passed in might respond to ==, e.g. `Arel::Nodes::Grouping`. In this case, `opts == :chain` returns `Arel::Nodes::Equality` which causes odd behaviour. Prefer `if :chain == opts` which guarantees that `Symbol#==` would be invoked. Alternatively consider `eql?`.
* use path escaping for email addressesAaron Patterson2015-09-042-4/+4
| | | | | | Due to e25fdad2f147e6f368958f9a06a5ac9d10288408, we are correctly using path escaping for email addresses. This commit fixes the tests to expect path escaping.
* use `Rack::Utils.unescape_path` to unescape pathsAaron Patterson2015-09-042-4/+4
| | | | | | Escaping and unescaping paths is different than query parameters, and we need to respect that. This commit uses the new method in Rack to escape and unescape paths. Fixes #11816
* Merge pull request #21412 from yui-knk/feature/irreversible_migration_error_msgYves Senn2015-09-042-2/+77
|\ | | | | | | Add detailed error message to `IrreversibleMigration`
| * Revert mistakenly added Gemfile.lockyui-knk2015-09-031-4/+0
| |
| * Add detailed error message to `IrreversibleMigration`yui-knk2015-08-301-1/+6
| |
| * [ci skip] Add comments for `IrreversibleMigration`yui-knk2015-08-291-0/+70
| |
| * Add detailed error message to `IrreversibleMigration`yui-knk2015-08-282-1/+5
| |
| * Add detailed error message to `IrreversibleMigration`yui-knk2015-08-281-1/+1
| |
* | Merge pull request #21492 from y-yagi/fix_module_name_typo_in_api_app_guideKasper Timm Hansen2015-09-041-1/+1
|\ \ | | | | | | fix module name typo in API app guide [ci skip]
| * | fix module name typo in API app guide [ci skip]yuuji.yaginuma2015-09-041-1/+1
|/ /
* | Merge pull request #21435 from justanshulsharma/unicode-versionCarlos Antonio da Silva2015-09-033-1/+5
|\ \ | | | | | | Update Unicode Version to 8.0.0
| * | Update Unicode Version to 8.0.0Anshul Sharma2015-09-043-1/+5
|/ /
* | 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