Commit Graph

46514 Commits

Author SHA1 Message Date
Zachary Scott
161382fd04 [ci skip] "..enables interrorgating of [thing].." would be correct 2014-08-19 23:35:52 -07:00
Akira Matsuda
4b7ac2e83e Drop schema_migrations table only when exists 2014-08-20 14:26:22 +09:00
Rafael Mendonça França
7422d2175d Merge pull request #16572 from lucasmazza/lm-remove-actionmailer-global-helpers
Remove global helpers from the ActionMailer test suite.
2014-08-19 23:57:52 -03:00
Lucas Mazza
63f7b22a4e Remove global helpers from the ActionMailer test suite. 2014-08-19 23:53:19 -03:00
David Heinemeier Hansson
78728af2c9 Extra space 2014-08-19 19:31:18 -07:00
Rafael Mendonça França
c8041aba6b Merge pull request #16571 from lucasmazza/lm-fix-actionmailer-test-case
Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::TestCase.
2014-08-19 23:28:51 -03:00
Lucas Mazza
04db4c2868 Add set_delivery_method and restore_delivery_method to ActionMailer::TestCase.
This way these methods are available outside the ActionMailer test suite, but
they are still duplicated inside `test/abstract_unit` for test cases that don't
inherit from the `ActionMailer::TestCase` class.
2014-08-19 23:26:45 -03:00
Rafael Mendonça França
5d81a7d5f8 Create a group to active job gems 2014-08-19 23:21:39 -03:00
Godfrey Chan
75fafc70d6 Copy & paste fail [ci skip] 2014-08-19 19:13:08 -07:00
Godfrey Chan
71c8a85724 💅 The note doesn't look good on the blue background [ci skip] 2014-08-19 19:06:12 -07:00
Godfrey Chan
657436da41 💣 oops, it should be 4.2 that's WIP [ci skip] 2014-08-19 19:03:43 -07:00
Godfrey Chan
1a1f2e122e Some placeholders for the 4.2 upgrade guide [ci skip] 2014-08-19 18:58:20 -07:00
Godfrey Chan
2d24eb4ee7 Clearly mark these as WIP, and invite people to contribute. [ci skip] 2014-08-19 18:50:13 -07:00
Godfrey Chan
a568260183 List the 4.2 release notes in the index, mark it as WIP [ci skip] 2014-08-19 18:44:37 -07:00
Godfrey Chan
d8db05fb01 Major features in 4.2 release notes [ci skip] 2014-08-19 18:40:43 -07:00
Carlos Antonio da Silva
e43271444b Fix failing railties tests
A combination of two commits led into these failures:

* The addition of a new active_record config in
  24bb8347b6ff0da90059314d9aece7a2c94a272c
* The revert of the config to use config.x as options holder in
  43073b393d234acd094ac7c220163f4e419d11f5

These tests remove activerecord from the load path, however the
configuration is still in the application file, and they blow up.
2014-08-19 22:37:18 -03:00
Carlos Antonio da Silva
6e420aa99c Fix blank link on config/application.rb app template [ci skip] 2014-08-19 22:21:57 -03:00
Godfrey Chan
f288533b4f Synced AR release notes [ci-skip] 2014-08-19 18:20:18 -07:00
Jeremy Kemper
79d50ce310 Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-token
CSRF token mask from breach-mitigation-rails gem
2014-08-19 18:17:07 -07:00
Godfrey Chan
e40872fff9 Synced Active Support release notes [ci skip]
[Godfrey Chan, Genadi Samokovarov]
2014-08-19 18:06:01 -07:00
Carlos Antonio da Silva
156ba1b5c7 Use the released turbolinks gem 2014-08-19 21:59:01 -03:00
Carlos Antonio da Silva
2f7ac9cdcc Fix setting simple values to the new config.x
Previously setting simple values to the config.x object resulted in the
following:

    config.x.super_debugger = true
    config.x.super_debugger #=> {}

Which was against the examples showed in the changelog/release notes.
2014-08-19 21:59:01 -03:00
Rafael Mendonça França
e2066818e8 Point to right sass-rails version 2014-08-19 21:58:05 -03:00
Godfrey Chan
9733dc5b39 Synced Active Model changelogs [ci skip]
Godfrey Chan, Genadi Samokovarov
2014-08-19 17:45:28 -07:00
Guillermo Iguaran
35b2d3f56c Use web-console 2.0.0.beta2 on new apps 2014-08-19 19:39:29 -05:00
Rafael Mendonça França
d4f018fc25 Require sprockets-rails 3.0.0.beta1 2014-08-19 19:57:55 -03:00
Rafael Mendonça França
43073b393d Revert "Improve custom configuration"
This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336.

Conflicts:
	railties/lib/rails/railtie/configuration.rb

It added regression. Will be back after the beta
2014-08-19 19:41:15 -03:00
Bradley Buda
69fc0e1b5e Auth token mask from breach-mitigation-rails gem
This merges in the code from the breach-mitigation-rails gem that masks
authenticity tokens on each request by XORing them with a random set of
bytes. The masking is used to make it impossible for an attacker to
steal a CSRF token from an SSL session by using techniques like the
BREACH attack.

The patch is pretty simple - I've copied over the [relevant
code](https://github.com/meldium/breach-mitigation-rails/blob/master/lib/breach_mitigation/masking_secrets.rb)
and updated the tests to pass, mostly by adjusting stubs and mocks.
2014-08-19 15:28:07 -07:00
Rafael Mendonça França
867631f9cf Require rack/utils 2014-08-19 19:25:30 -03:00
Guillermo Iguaran
b9700c1e51 Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelog
Mention web-console in 4.2 release notes
2014-08-19 16:20:53 -05:00
Zachary Scott
6b66ec3e65 Merge pull request #16475 from tomkadwill/has_many_scope_documentation
[ci skip] Added documentation for belongs_to scope parameter
2014-08-19 14:02:30 -07:00
Genadi Samokovarov
5407084cc5 Mention web-console in 4.2 release notes
Mention the web-console inclusion in the default Gemfile in the Release
notes and the railties changelog. We can eventually mention it in the
upgrade guide, if needed.

[ci skip]
2014-08-20 00:01:10 +03:00
Tom Kadwill
58557179f8 [ci skip] Added documentation for belongs_to scope parameter 2014-08-19 21:51:11 +01:00
Rafael Mendonça França
299c264552 We always get the value so no need to check nil or Hash 2014-08-19 17:38:29 -03:00
Zachary Scott
a5d50ac147 Move date and time requires to time_travel_test, also include
'abstract_unit'.

cc #16564
2014-08-19 13:17:23 -07:00
Rafael Mendonça França
6986535a21 Add TODO note about the gems missing release 2014-08-19 16:50:29 -03:00
Rafael Mendonça França
edfc36d336 Remove git dependecies 2014-08-19 16:49:04 -03:00
Rafael Mendonça França
091645116b Use released rails-html-sanitizer 2014-08-19 16:47:26 -03:00
Rafael Mendonça França
08f209614b Use released rails-deprecated_sanitizer 2014-08-19 16:45:31 -03:00
Jeremy Kemper
9bea72b6fb Bump ActiveJob's GlobalID dep to 0.2.3+ to fix Railties tests 2014-08-19 12:45:04 -07:00
Jeremy Kemper
e9bc3ef5c9 Merge pull request #16564 from zzak/move_time_travel_test
Move TimeHelperTest to TimeTravelTest from `as/test_test.rb`
2014-08-19 12:44:14 -07:00
Rafael Mendonça França
fad9e729f1 Fix the rails-dom-testing dependecy 2014-08-19 16:41:38 -03:00
Rafael Mendonça França
24bb8347b6 Merge pull request #16563 from arthurnn/add_ar_raise_trans_option
Add default .raise_in_transactional_callbacks option to template
2014-08-19 16:19:36 -03:00
Rafael Mendonça França
b8ef1d8abd loofah require dependecy is not needed anymore 2014-08-19 16:15:41 -03:00
Rafael Mendonça França
315de6e490 Merge pull request #16349 from jmcnevin/master
Correctly determine if migration is needed.
2014-08-19 15:55:15 -03:00
Rafael Mendonça França
48e2b86a50 Merge pull request #16536 from rails/improve-custom-configuration
Improve custom configuration
2014-08-19 15:52:04 -03:00
Rafael Mendonça França
d59a24d543 Protect against error when parsing parameters with Bad Request
Related with #11795.
2014-08-19 15:36:05 -03:00
Jeremy Kemper
4d1d81d338 Merge pull request #16299 from sikachu/ps-safer-ac-params
Update `ActionController::Parameters` to be more secure on parameters handling
2014-08-19 11:31:38 -07:00
Zachary Scott
ab291e8718 Move TimeHelperTest to TimeTravelTest from as/test_test.rb 2014-08-19 11:29:26 -07:00
Arthur Neves
c7c2df2c63
Add default .raise_in_transactional_callbacks option to template 2014-08-19 13:56:55 -04:00