Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove end-of-line spacing in development.rb, production.rb | Nick Sinenko | 2014-08-20 | 2 | -2/+2 |
| | |||||
* | 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 |
| | |||||
* | Fix setting simple values to the new config.x | Carlos Antonio da Silva | 2014-08-19 | 3 | -11/+23 |
| | | | | | | | | | | 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 |
| | |||||
* | Use web-console 2.0.0.beta2 on new apps | Guillermo Iguaran | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Revert "Improve custom configuration" | Rafael Mendonça França | 2014-08-19 | 6 | -126/+31 |
| | | | | | | | | | This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta | ||||
* | Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelog | Guillermo Iguaran | 2014-08-19 | 1 | -0/+7 |
|\ | | | | | Mention web-console in 4.2 release notes | ||||
| * | Mention web-console in 4.2 release notes | Genadi Samokovarov | 2014-08-20 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | 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] | ||||
* | | We always get the value so no need to check nil or Hash | Rafael Mendonça França | 2014-08-19 | 1 | -6/+2 |
| | | |||||
* | | Use released rails-html-sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 |
| | | |||||
* | | 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 | 1 | -2/+0 |
| | | |||||
* | | Improve custom configuration | Rafael Mendonça França | 2014-08-19 | 6 | -31/+130 |
|/ | | | | | | | | | | | | | | | | 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] | ||||
* | Rack is released too | Rafael Mendonça França | 2014-08-18 | 1 | -4/+2 |
| | |||||
* | No need to point to arel and i18n master anymore | Rafael Mendonça França | 2014-08-18 | 1 | -6/+2 |
| | |||||
* | Fix rails-html_sanitizer in Gemfile template | Jon Atack | 2014-08-18 | 1 | -1/+1 |
| | | | [skip ci] | ||||
* | Merge pull request #16062 from sgrif/sg-required-generators | Rafael Mendonça França | 2014-08-17 | 4 | -4/+80 |
|\ | | | | | Add a `required` option to the model generator | ||||
| * | Add a `required` option to the model generator | Sean Griffin | 2014-08-08 | 4 | -4/+80 |
| | | | | | | | | | | | | | | | | | | | | | | Syntax was chosen to follow the passing of multiple options to decimal/numeric types. Curly braces, and allowing any of `,`, `.`, or `-` to be used as a separator to avoid the need for shell quoting. (I'm intending to expand this to all columns, but that's another PR. The `required` option will cause 2 things to change. `required: true` will be added to the association. `null: false` will be added to the column in the migration. | ||||
* | | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-17 | 10 | -46/+23 |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | ||||
| * \ | Merge pull request #16481 from sgrif/sg-change-default-timestamps | David Heinemeier Hansson | 2014-08-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Change the default `null` value for timestamps | ||||
| | * | | Change the default `null` value for timestamps | Sean Griffin | 2014-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per discussion, this changes the model generators to specify `null: false` for timestamp columns. A warning is now emitted if `timestamps` is called without a `null` option specified, so we can safely change the behavior when no option is specified in Rails 5. | ||||
| * | | | Merge pull request #16294 from bf4/code_tools | Rafael Mendonça França | 2014-08-17 | 1 | -35/+0 |
| |\ \ \ | | | | | | | | | | | Update, unify, encapsulate, and fix various code tools in Rails | ||||
| | * | | | Remove unused, broken, legacy ruby-prof extension from 2005 | Benjamin Fleischer | 2014-07-25 | 1 | -35/+0 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-17 | 3 | -1/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #16485 from seuros/activejob | David Heinemeier Hansson | 2014-08-17 | 2 | -0/+8 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails | ||||
| | | * | | | | Added docs for AJ::Callbacks; Added AJ to docs build map | Cristian Bica | 2014-08-16 | 1 | -0/+7 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into activejob | Cristian Bica | 2014-08-13 | 1 | -0/+10 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Remove activejob integration tests | Abdelkader Boudih | 2014-08-12 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Lock web-console to 2.0.0.beta1 for the first 4.2 beta | Genadi Samokovarov | 2014-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console on exception code isn't available on the stable releases yet. Lock it for now, so the beta users get a sneak peak of the console features. | ||||
| * | | | | | | | Dont encourage people to run without autoflush in production | David Heinemeier Hansson | 2014-08-17 | 1 | -3/+0 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2 | Godfrey Chan | 2014-08-17 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies digest config option (pt. 2) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/middleware/cookies.rb | ||||
| | * | | | | | | Add config option for cookies digest | Łukasz Strzałkowski | 2014-08-12 | 1 | -1/+2 |
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = 'SHA256' | ||||
| * | | | | | | s/Dont'/Don't/ | Akira Matsuda | 2014-08-15 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Railties tests are order_independent! Hopefully. | Akira Matsuda | 2014-08-13 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Fix Railties tests that were order dependent | Akira Matsuda | 2014-08-13 | 1 | -0/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Use the release gems and point application gemfile to right loofah | Rafael Mendonça França | 2014-08-17 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Prepare for partial release. | Kasper Timm Hansen | 2014-08-17 | 1 | -0/+3 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - Default to Rails::DeprecatedSanitizer in ActionView::Helpers::SanitizeHelper. - Add upgrade notes. - Add sanitizer to new applications Gemfiles. - Remove 'rails-dom-testing' as a dependency. | ||||
* | | | | Nobody sucks so nobody should call this awful method name | Rafael Mendonça França | 2014-08-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent! | Akira Matsuda | 2014-08-12 | 1 | -0/+4 |
| |/ / |/| | | | | | | | | | | | Calling ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent! in AS::TestCase makes everyone's tests order dependent, which should never be done by the framework. | ||||
* | | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option" | Santiago Pastorino | 2014-08-08 | 2 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!! | ||||
* | | | Merge pull request #16434 from strzalek/cookies-digest-config-option | Santiago Pastorino | 2014-08-08 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Add digest config option for SignedCookiesJar | ||||
| * | | | Return preconfigured AS::MessageVerifier | Łukasz Strzałkowski | 2014-08-08 | 2 | -1/+7 |
| | | | | |||||
| * | | | Add config option for cookies digest | Łukasz Strzałkowski | 2014-08-08 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = \SHA256' | ||||
* | | | save a hash allocation per request. | Aaron Patterson | 2014-08-08 | 1 | -1/+1 |
| | | | |||||
* | | | add a test for prepending SCRIPT_NAME to generated urls | Aaron Patterson | 2014-08-08 | 1 | -0/+88 |
| | | | |||||
* | | | Fixes test for Gemfile entry changes | Arun Agrawal | 2014-08-08 | 3 | -8/+13 |
|/ / | | | | | | | Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c | ||||
* | | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵ | David Heinemeier Hansson | 2014-08-07 | 2 | -10/+12 |
| | | | | | | | | so it can be grouped with the other development tools | ||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-07 | 9 | -16/+178 |
|\ \ |