Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove global helpers from the ActionMailer test suite. | Lucas Mazza | 2014-08-19 | 2 | -13/+1 |
| | |||||
* | Extra space | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+0 |
| | |||||
* | Merge pull request #16571 from lucasmazza/lm-fix-actionmailer-test-case | Rafael Mendonça França | 2014-08-19 | 1 | -0/+9 |
|\ | | | | | Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::TestCase. | ||||
| * | Add `set_delivery_method` and `restore_delivery_method` to ↵ | Lucas Mazza | 2014-08-19 | 1 | -0/+9 |
|/ | | | | | | | | `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. | ||||
* | Create a group to active job gems | Rafael Mendonça França | 2014-08-19 | 1 | -11/+13 |
| | |||||
* | Copy & paste fail [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | :nail_care: The note doesn't look good on the blue background [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -2/+2 |
| | |||||
* | :bomb: oops, it should be 4.2 that's WIP [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -5/+4 |
| | |||||
* | Some placeholders for the 4.2 upgrade guide [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+16 |
| | |||||
* | Clearly mark these as WIP, and invite people to contribute. [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -1/+6 |
| | |||||
* | List the 4.2 release notes in the index, mark it as WIP [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+5 |
| | |||||
* | Major features in 4.2 release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+40 |
| | |||||
* | Fix failing railties tests | Carlos Antonio da Silva | 2014-08-19 | 1 | -2/+6 |
| | | | | | | | | | | | | 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. | ||||
* | Fix blank link on config/application.rb app template [ci skip] | Carlos Antonio da Silva | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Synced AR release notes [ci-skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+18 |
| | |||||
* | Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-token | Jeremy Kemper | 2014-08-19 | 2 | -8/+71 |
|\ | | | | | CSRF token mask from breach-mitigation-rails gem | ||||
| * | Auth token mask from breach-mitigation-rails gem | Bradley Buda | 2014-08-19 | 2 | -8/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Synced Active Support release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+21 |
| | | | | | | | | [Godfrey Chan, Genadi Samokovarov] | ||||
* | | Use the released turbolinks gem | Carlos Antonio da Silva | 2014-08-19 | 1 | -3/+1 |
| | | |||||
* | | Fix setting simple values to the new config.x | Carlos Antonio da Silva | 2014-08-19 | 4 | -13/+24 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Point to right sass-rails version | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 |
| | | |||||
* | | Synced Active Model changelogs [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -4/+16 |
| | | | | | | | | Godfrey Chan, Genadi Samokovarov | ||||
* | | Use web-console 2.0.0.beta2 on new apps | Guillermo Iguaran | 2014-08-19 | 1 | -1/+1 |
| | | |||||
* | | Require sprockets-rails 3.0.0.beta1 | Rafael Mendonça França | 2014-08-19 | 2 | -2/+1 |
| | | |||||
* | | Revert "Improve custom configuration" | Rafael Mendonça França | 2014-08-19 | 8 | -145/+46 |
| | | | | | | | | | | | | | | | | | | This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta | ||||
* | | Require rack/utils | Rafael Mendonça França | 2014-08-19 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelog | Guillermo Iguaran | 2014-08-19 | 2 | -0/+10 |
|\ \ | | | | | | | Mention web-console in 4.2 release notes | ||||
| * | | Mention web-console in 4.2 release notes | Genadi Samokovarov | 2014-08-20 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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] | ||||
* | | | Merge pull request #16475 from tomkadwill/has_many_scope_documentation | Zachary Scott | 2014-08-19 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | [ci skip] Added documentation for belongs_to scope parameter | ||||
| * | | | [ci skip] Added documentation for belongs_to scope parameter | Tom Kadwill | 2014-08-19 | 1 | -0/+11 |
| | | | | |||||
* | | | | We always get the value so no need to check nil or Hash | Rafael Mendonça França | 2014-08-19 | 1 | -6/+2 |
| | | | | |||||
* | | | | Move date and time requires to time_travel_test, also include | Zachary Scott | 2014-08-19 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'abstract_unit'. cc #16564 | ||||
* | | | | Add TODO note about the gems missing release | Rafael Mendonça França | 2014-08-19 | 1 | -1/+3 |
| | | | | |||||
* | | | | Remove git dependecies | Rafael Mendonça França | 2014-08-19 | 1 | -2/+0 |
| | | | | |||||
* | | | | Use released rails-html-sanitizer | Rafael Mendonça França | 2014-08-19 | 2 | -2/+2 |
| | | | | |||||
* | | | | Use released rails-deprecated_sanitizer | Rafael Mendonça França | 2014-08-19 | 3 | -3/+2 |
| | | | | |||||
* | | | | Bump ActiveJob's GlobalID dep to 0.2.3+ to fix Railties tests | Jeremy Kemper | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16564 from zzak/move_time_travel_test | Jeremy Kemper | 2014-08-19 | 2 | -69/+68 |
|\ \ \ \ | | | | | | | | | | | Move TimeHelperTest to TimeTravelTest from `as/test_test.rb` | ||||
| * | | | | Move TimeHelperTest to TimeTravelTest from `as/test_test.rb` | Zachary Scott | 2014-08-19 | 2 | -69/+68 |
| | | | | | |||||
* | | | | | Fix the rails-dom-testing dependecy | Rafael Mendonça França | 2014-08-19 | 3 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #16563 from arthurnn/add_ar_raise_trans_option | Rafael Mendonça França | 2014-08-19 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Add default .raise_in_transactional_callbacks option to template | ||||
| * | | | | | Add default .raise_in_transactional_callbacks option to template | Arthur Neves | 2014-08-19 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | loofah require dependecy is not needed anymore | Rafael Mendonça França | 2014-08-19 | 2 | -4/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #16349 from jmcnevin/master | Rafael Mendonça França | 2014-08-19 | 2 | -9/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Correctly determine if migration is needed. | ||||
| * | | | | | | Correctly determine if migration is needed. | Jeremy McNevin | 2014-08-13 | 2 | -9/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method would assume that if last migration in the migrations directory matched the current schema version, that the database was up to date, but this does not account for new migrations with older timestamps that may be pending. | ||||
* | | | | | | | Merge pull request #16536 from rails/improve-custom-configuration | Rafael Mendonça França | 2014-08-19 | 8 | -46/+149 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve custom configuration | ||||
| * | | | | | | | Improve custom configuration | Rafael Mendonça França | 2014-08-19 | 8 | -46/+149 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva] | ||||
* | | | | | | | Protect against error when parsing parameters with Bad Request | Rafael Mendonça França | 2014-08-19 | 3 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with #11795. | ||||
* | | | | | | | Merge pull request #16299 from sikachu/ps-safer-ac-params | Jeremy Kemper | 2014-08-19 | 5 | -39/+382 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Update `ActionController::Parameters` to be more secure on parameters handling | ||||
| * | | | | | | User `#to_hash` instead of calling `super` | Prem Sichanugrist | 2014-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.9.3 does not implement Hash#to_h, so we can't call `super` on it. |