Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+3 | |
| | | | ||||||
* | | | Leave all our tests as order_dependent! for now | Matthew Draper | 2014-09-02 | 1 | -0/+4 | |
|/ / | | | | | | | | | | | | | | | | | We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa. | |||||
* | | Add test to assert the right sanitizer vendor is being used | Rafael Mendonça França | 2014-09-01 | 1 | -0/+41 | |
| | | ||||||
* | | Try with web-console master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | | ||||||
* | | Use jquery-rails master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | | ||||||
* | | Keep it closer to the original wording [ci skip] | Godfrey Chan | 2014-08-31 | 1 | -1/+1 | |
| | | ||||||
* | | Since /console is an optional feature, mention <%= console %> instead. | Rhett Sutphin | 2014-08-31 | 1 | -1/+1 | |
|/ | | | | (/console is not mounted by default with web-console 2.0.) | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-29 | 20 | -35/+93 | |
|\ | ||||||
| * | Expectations first | Akira Matsuda | 2014-08-28 | 4 | -9/+9 | |
| | | ||||||
| * | Reset RACK_ENV after modified in a test case | Akira Matsuda | 2014-08-28 | 1 | -0/+1 | |
| | | ||||||
| * | Rails.root should be a Pathname | Akira Matsuda | 2014-08-28 | 1 | -1/+1 | |
| | | ||||||
| * | Fix spelling. [CI SKIP] | Guo Xiang Tan | 2014-08-27 | 1 | -1/+1 | |
| | | ||||||
| * | fix broken `gem` method with non-String arguments. Closes #16709. | Yves Senn | 2014-08-27 | 3 | -4/+23 | |
| | | | | | | | | This was caused by #15327. | |||||
| * | show stats for app/jobs | yuuji.yaginuma | 2014-08-24 | 1 | -1/+2 | |
| | | ||||||
| * | [ActiveJob] Add hook for test_framework and test templates | Abdelkader Boudih | 2014-08-22 | 2 | -0/+22 | |
| | | ||||||
| * | Merge pull request #16622 from matthewd/default-debug | Matthew Draper | 2014-08-23 | 2 | -3/+3 | |
| |\ | | | | | | | Don't fight against ourselves for the default log level | |||||
| | * | Don't fight against ourselves for the default log level | Matthew Draper | 2014-08-22 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | If we want to always default to :debug, let's just do that. At which point the production.rb entry can become an "uncomment to change" instead. | |||||
| * | | Merge pull request #16604 from saarons/clean-remote-ip-middleware | Jeremy Kemper | 2014-08-21 | 1 | -1/+15 | |
| |\ \ | | | | | | | | | ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies | |||||
| | * | | Refactor ActionDispatch::RemoteIp | Sam Aarons | 2014-08-21 | 1 | -1/+15 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored IP address checking in ActionDispatch::RemoteIp to rely on the IPAddr class instead of the unwieldly regular expression to match IP addresses. This commit keeps the same api but allows users to pass IPAddr objects to config.action_dispatch.trusted_proxies in addition to passing strings and regular expressions. Example: # config/environments/production.rb config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16') | |||||
| * | | fix grammar [ci skip] | Vijay Dev | 2014-08-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | fix server names [ci skip] | Vijay Dev | 2014-08-22 | 1 | -1/+1 | |
| |/ | | | | | Per feedback in https://github.com/rails/rails/commit/af63e4a2546629c3fb2d53cffb7d4ea0e8663f68#commitcomment-7477636 | |||||
| * | Make text consistent in help text of rails server and console commands. | Vijay Dev | 2014-08-21 | 2 | -13/+13 | |
| | | ||||||
| * | Remove timestamp type from generator usage | Rafael Mendonça França | 2014-08-20 | 1 | -1/+0 | |
| | | | | | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be | |||||
| * | Require ActiveJob in case a skip_xxx option is given | slainer68 | 2014-08-20 | 2 | -0/+2 | |
| | | | | | | | | Change position of require active_job | |||||
| * | remove end-of-line spacing in development.rb, production.rb | Nick Sinenko | 2014-08-20 | 2 | -2/+2 | |
| | | ||||||
* | | Preparing for 4.2.0.beta1 release | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+1 | |
|/ | ||||||
* | 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] |