Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Change "For not..." to "Do not...". | Kale Worsley | 2014-09-04 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #16756 from huoxito/dont-mess-railties-default-order | Rafael Mendonça França | 2014-09-03 | 1 | -8/+9 | |
|\ | | | | | Dont mess with default order engines load (4.1.6.rc1 regression) | |||||
| * | Dont mess with default order engines load | Washington Luiz | 2014-09-02 | 1 | -8/+9 | |
| | | | | | | | | | | | | | | When copying migrations some engines might depend on schema from other engine so we can't blindly reverse all railties collection as that would affect the order they were originally loaded. This patch helps to only apply the order from engines specified in `railties_order` | |||||
* | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+0 | |
| | | ||||||
* | | [ActiveJob] TestCase | Abdelkader Boudih | 2014-09-02 | 1 | -1/+3 | |
| | | ||||||
* | | 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 | 11 | -23/+48 | |
|\ | ||||||
| * | fix broken `gem` method with non-String arguments. Closes #16709. | Yves Senn | 2014-08-27 | 1 | -4/+6 | |
| | | | | | | | | 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. | |||||
| * | | 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 | 1 | -0/+1 | |
| | | | | | | | | 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 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 | 1 | -4/+10 | |
| | | | | | | | | | | 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 | 2 | -37/+15 | |
| | | | | | | | | | This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta | |||||
* | 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 | 2 | -15/+41 | |
|/ | | | | | | | | | | | | | | | | 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 | 1 | -4/+20 | |
|\ | | | | | Add a `required` option to the model generator | |||||
| * | Add a `required` option to the model generator | Sean Griffin | 2014-08-08 | 1 | -4/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -41/+12 | |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | |||||
| * \ | 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 | |
| | | | | | | ||||||
| | | * | | | 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 | |
| | |/ / | |/| | |