aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2911-23/+48
|\
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-271-4/+6
| | | | | | | | This was caused by #15327.
| * show stats for app/jobsyuuji.yaginuma2014-08-241-1/+2
| |
| * [ActiveJob] Add hook for test_framework and test templatesAbdelkader Boudih2014-08-222-0/+22
| |
| * Merge pull request #16622 from matthewd/default-debugMatthew Draper2014-08-232-3/+3
| |\ | | | | | | Don't fight against ourselves for the default log level
| | * Don't fight against ourselves for the default log levelMatthew Draper2014-08-222-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 Dev2014-08-221-1/+1
| | |
| * | fix server names [ci skip]Vijay Dev2014-08-221-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 Dev2014-08-212-13/+13
| |
| * Remove timestamp type from generator usageRafael Mendonça França2014-08-201-1/+0
| | | | | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be
| * Require ActiveJob in case a skip_xxx option is givenslainer682014-08-201-0/+1
| | | | | | | | Change position of require active_job
| * remove end-of-line spacing in development.rb, production.rbNick Sinenko2014-08-202-2/+2
| |
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Fix blank link on config/application.rb app template [ci skip]Carlos Antonio da Silva2014-08-191-1/+1
|
* Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-191-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 versionRafael Mendonça França2014-08-191-1/+1
|
* Use web-console 2.0.0.beta2 on new appsGuillermo Iguaran2014-08-191-1/+1
|
* Revert "Improve custom configuration"Rafael Mendonça França2014-08-192-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 HashRafael Mendonça França2014-08-191-6/+2
|
* Use released rails-html-sanitizerRafael Mendonça França2014-08-191-1/+1
|
* Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\ | | | | Add default .raise_in_transactional_callbacks option to template
| * Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
| |
* | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-191-2/+0
| |
* | Improve custom configurationRafael Mendonça França2014-08-192-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 tooRafael Mendonça França2014-08-181-4/+2
|
* No need to point to arel and i18n master anymoreRafael Mendonça França2014-08-181-6/+2
|
* Fix rails-html_sanitizer in Gemfile templateJon Atack2014-08-181-1/+1
| | | [skip ci]
* Merge pull request #16062 from sgrif/sg-required-generatorsRafael Mendonça França2014-08-171-4/+20
|\ | | | | Add a `required` option to the model generator
| * Add a `required` option to the model generatorSean Griffin2014-08-081-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 loofahRafael Mendonça França2014-08-177-41/+12
|\ \ | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * \ Merge pull request #16294 from bf4/code_toolsRafael Mendonça França2014-08-171-35/+0
| |\ \ | | | | | | | | Update, unify, encapsulate, and fix various code tools in Rails
| | * | Remove unused, broken, legacy ruby-prof extension from 2005Benjamin Fleischer2014-07-251-35/+0
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-173-1/+9
| |\ \ \
| | * \ \ Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-172-0/+8
| | |\ \ \ | | | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails
| | | * | | Added docs for AJ::Callbacks; Added AJ to docs build mapCristian Bica2014-08-161-0/+7
| | | | | |
| | | * | | Remove activejob integration testsAbdelkader Boudih2014-08-121-0/+1
| | | | | |
| | * | | | Lock web-console to 2.0.0.beta1 for the first 4.2 betaGenadi Samokovarov2014-08-181-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 productionDavid Heinemeier Hansson2014-08-171-3/+0
| |/ / / /
| * | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-171-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łkowski2014-08-121-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 Matsuda2014-08-151-1/+1
| | |/ / | |/| |
* | | | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-171-1/+3
| | | |
* | | | Prepare for partial release.Kasper Timm Hansen2014-08-171-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.
* | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-081-2/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!!
* | | Merge pull request #16434 from strzalek/cookies-digest-config-optionSantiago Pastorino2014-08-081-1/+2
|\ \ \ | | | | | | | | Add digest config option for SignedCookiesJar
| * | | Return preconfigured AS::MessageVerifierŁukasz Strzałkowski2014-08-081-1/+1
| | | |
| * | | Add config option for cookies digestŁukasz Strzałkowski2014-08-081-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 Patterson2014-08-081-1/+1
| | |
* | | Fixes test for Gemfile entry changesArun Agrawal2014-08-082-2/+2
|/ / | | | | | | Broken by fbe38c9e9d4fe9f82518e8ffc1d757459b0c5f1c
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵David Heinemeier Hansson2014-08-072-10/+12
| | | | | | | | so it can be grouped with the other development tools