Commit Graph

53006 Commits

Author SHA1 Message Date
Aaron Patterson
f443ae670d Use ERB::Utils to percent encode hfvalue parts of mailto
`hfvalue` parts should always be percent encoded, so lets do that!

Revert "use path escaping for email addresses"

This reverts commit 21ffef38a5dc5a6a21f7e841aecab5b51f4fd185.
2015-09-05 10:59:46 -07:00
Kasper Timm Hansen
f2400de801 Merge pull request #21506 from rodzyn/remove_mocha_part_3
Remove mocha from ActionPack tests
2015-09-05 18:54:28 +02:00
Marcin Olichwirowicz
81bc771e7c Remove mocha from ActionPack tests 2015-09-05 16:58:40 +02:00
Aaron Patterson
a8f4568f53 implement abstract store methods
converts old ID methods to the new abstract store methods in Rack
2015-09-04 19:25:59 -07:00
Aaron Patterson
bcfa2a0d5e stop using deprecated Abstract::ID class 2015-09-04 18:58:49 -07:00
Aaron Patterson
529136d670 stop inheriting from Rack::Request
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
2015-09-04 17:37:22 -07:00
Sean Griffin
3f24fa338f Merge pull request #21504 from ioquatix/patch-1
#where fails if opts.responds_to?(:==) unexpectedly
2015-09-04 17:35:12 -06:00
Samuel Williams
c431f1754b #where fails if opts.responds_to?(:==) unexpectedly
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?`.
2015-09-05 11:33:21 +12:00
Aaron Patterson
21ffef38a5 use path escaping for email addresses
Due to e25fdad2f147e6f368958f9a06a5ac9d10288408, we are correctly using
path escaping for email addresses.  This commit fixes the tests to
expect path escaping.
2015-09-04 15:20:07 -07:00
Aaron Patterson
e25fdad2f1 use Rack::Utils.unescape_path to unescape paths
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
2015-09-04 14:43:46 -07:00
Yves Senn
451b954c2f Merge pull request #21412 from yui-knk/feature/irreversible_migration_error_msg
Add detailed error message to `IrreversibleMigration`
2015-09-04 12:04:21 +02:00
Kasper Timm Hansen
01598e9555 Merge pull request #21492 from y-yagi/fix_module_name_typo_in_api_app_guide
fix module name typo in API app guide [ci skip]
2015-09-04 09:37:59 +02:00
yuuji.yaginuma
40c96f7be5 fix module name typo in API app guide [ci skip] 2015-09-04 14:38:54 +09:00
Carlos Antonio da Silva
db69045f7d Merge pull request #21435 from justanshulsharma/unicode-version
Update Unicode Version to 8.0.0
2015-09-03 16:13:37 -03:00
Anshul Sharma
6cb7faf3a2 Update Unicode Version to 8.0.0 2015-09-04 00:16:03 +05:30
Carlos Antonio da Silva
314eb6596a Merge pull request #21473 from akihiro17/remove-unused-require
Remove unnecessary require in associations_test.rb
2015-09-03 14:45:53 -03:00
Carlos Antonio da Silva
21d6eb3603 Merge pull request #21481 from prakashlaxkar/remove_config
Removed unused config from activemodel test
2015-09-03 14:42:47 -03:00
yui-knk
4ca27c25f6 Revert mistakenly added Gemfile.lock 2015-09-03 21:53:00 +09:00
Eileen M. Uchitelle
0294c61359 Merge pull request #21483 from justanshulsharma/add-ip6-address
[ci skip] Added localhost IPv6
2015-09-03 04:37:10 -04:00
Anshul Sharma
9567ba737f [ci skip] Added localhost IPv6 2015-09-03 14:02:52 +05:30
Prakash Laxkar
3ee1f7b40b Removed unused config file 2015-09-03 08:40:03 +05:30
Godfrey Chan
43dd118539 Merge pull request #21475 from y-yagi/add_description_of_return_value
add a description of the return value that was missing [ci skip]
2015-09-02 15:57:39 -07:00
yuuji.yaginuma
75d96ac831 add a description of the return value that was missing [ci skip] 2015-09-03 07:32:27 +09:00
akihiro17
715e845fa2 Remove unnecessary require in associations_test.rb 2015-09-03 04:27:07 +09:00
Yves Senn
d463b24f15 docs, make blank? behavior clear. Closes #21468. [ci skip] 2015-09-02 19:07:53 +02:00
Sean Griffin
3dd7cecfe3 Don't allocate a bunch of strings in Relation::Merger
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.
2015-09-02 10:40:27 -06:00
Zachary Scott
aa3acf85cb Merge pull request #21467 from yui-knk/doc/subscribe
[ci skip] Add description about which object
2015-09-02 09:43:50 -04:00
eileencodes
ec14aad419 Fix route creation when format is a blank string
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.
2015-09-02 09:18:46 -04:00
yui-knk
42c95b690f [ci skip] Add description about which object
`ActiveSupport::Notifications.subscribe` expects as second parameter.
2015-09-02 21:51:06 +09:00
Claudio B.
1829943943 Merge pull request #21462 from ignatiusreza/dev_dep_doc
fix invalid package name for libmysqlclient-dev mentioned in development_dependencies_install guide
2015-09-02 02:54:48 -07:00
Ignatius Reza
7a11b10e3d [ci skip] fix invalid package name for libmysqlclient-dev
tested on Ubuntu Desktop 15.04
2015-09-02 18:30:03 +09:00
Sean Griffin
2744efdc8b Merge pull request #21451 from kishore-mohan/typo-helper-description
Typo on helper description and action_controller_overview
2015-09-01 22:19:37 -06:00
kishore-mohan
cf82b2e034 typo "description not clear corrected with proper description and action_controller_overview file Rails' -> Rails" [ci skip] 2015-09-02 09:19:47 +05:30
Rafael Mendonça França
dc5cf37d73 Merge pull request #21456 from rodzyn/clean_requires
Remove not used requires
2015-09-01 16:08:06 -03:00
Rafael Mendonça França
4727a94c50 Respect scale of the column in the Decimal type
[Rafael Mendonça França + Jean Boussier]
2015-09-01 16:02:04 -03:00
Rafael Mendonça França
9f28cb9dc7 Add windows version of nokogiri 2015-09-01 16:02:03 -03:00
Marcin Olichwirowicz
b69699afda Remove not used requires 2015-09-01 20:36:47 +02:00
Rafael Mendonça França
8bf26321af Merge pull request #21455 from bkeepers/railties-license
Include MIT-LICENSE in railties gem
2015-09-01 15:20:56 -03:00
Brandon Keepers
1ab3c5a86c Include MIT-LICENSE in railties gem 2015-09-01 14:17:10 -04:00
Rafael Mendonça França
9c8a5abb42 Merge pull request #21454 from claudiob/fix-failing-tests-on-guides
Fix: make Travis CI happy about guides again
2015-09-01 14:09:18 -03:00
claudiob
9ddd1c4451 Fix: make Travis CI happy about guides again
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.
2015-09-01 10:00:06 -07:00
Kasper Timm Hansen
0cdcf98b77 Merge pull request #21453 from claudiob/minimum-sprockets-2
Require sprockets-rails >= 2
2015-09-01 18:34:58 +02:00
claudiob
6d02b75b2b Require sprockets-rails >= 2
Fixes 4d157ea8c1

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)
2015-09-01 09:30:38 -07:00
Kasper Timm Hansen
f1a3d4876f Merge pull request #21450 from amitsuroliya/minor_typo
typo fix [ci skip]
2015-09-01 15:12:35 +02:00
Kasper Timm Hansen
2c271296f5 Merge pull request #21447 from aditya-kapoor/add-missing-test-am
Add missing test for #17351
2015-09-01 15:01:09 +02:00
amitkumarsuroliya
a274c78c26 typo fix [ci skip]
sub-project's should be sub-projects' at all places
2015-09-01 18:27:23 +05:30
Kasper Timm Hansen
4a34915d40 Merge pull request #21444 from etdev/fix-readme-typo-its
Fix minor typo in README file
2015-09-01 14:49:45 +02:00
eileencodes
75a121a2c5 Fix bug where cookies mutated by request were not persisted
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.
2015-09-01 08:42:30 -04:00
Aditya Kapoor
69f3f81e6c Add missing test for #17351 2015-09-01 17:35:50 +05:30
Carlos Antonio da Silva
8ce0fdb5c4 Fix failure introduced by #17351 due to the new mocks implementation
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.
2015-09-01 08:53:29 -03:00