aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* Change "For not..." to "Do not...".Kale Worsley2014-09-041-1/+1
|
* build fix, we have to reset the RACK_ENV as well.Yves Senn2014-09-041-2/+5
| | | | | This is a follow-up to ded17a4 to get the build passing on Travis. As Travis has `ENV["RACK_ENV"]` set to `test` we need to reset that as well.
* Merge pull request #16775 from kaspth/ship-secure-sanitizerRafael Mendonça França2014-09-031-41/+0
|\ | | | | Ship with rails-html-sanitizer instead.
| * Ship with rails-html-sanitizer instead.Kasper Timm Hansen2014-09-031-41/+0
| |
* | Merge pull request #16756 from huoxito/dont-mess-railties-default-orderRafael Mendonça França2014-09-032-8/+45
|\ \ | | | | | | Dont mess with default order engines load (4.1.6.rc1 regression)
| * | Dont mess with default order engines loadWashington Luiz2014-09-022-8/+45
| | | | | | | | | | | | | | | | | | | | | 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`
* | | schema loading rake tasks maintain database connection for current env.Yves Senn2014-09-031-0/+26
| |/ |/| | | | | | | | | | | | | | | | | [Joshua Cody & Yves Senn] Closes #16757. Prior to this patch schema loading rake tasks had the potential to leak a connection to a different database. This had side-effects when rake tasks operating on the current connection (like `db:seed`) were chained.
* | Merge pull request #16724 from seuros/testcaseRafael Mendonça França2014-09-021-1/+2
|\ \ | | | | | | [ActiveJob] TestCase
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+0
| | |
| * | [ActiveJob] TestCaseAbdelkader Boudih2014-09-021-1/+3
| | |
* | | Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-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 usedRafael Mendonça França2014-09-011-0/+41
| |
* | Try with web-console masterRafael Mendonça França2014-09-011-1/+1
| |
* | Use jquery-rails masterRafael Mendonça França2014-09-011-1/+1
| |
* | Keep it closer to the original wording [ci skip]Godfrey Chan2014-08-311-1/+1
| |
* | Since /console is an optional feature, mention <%= console %> instead.Rhett Sutphin2014-08-311-1/+1
|/ | | | (/console is not mounted by default with web-console 2.0.)
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2920-35/+93
|\
| * Expectations firstAkira Matsuda2014-08-284-9/+9
| |
| * Reset RACK_ENV after modified in a test caseAkira Matsuda2014-08-281-0/+1
| |
| * Rails.root should be a PathnameAkira Matsuda2014-08-281-1/+1
| |
| * Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
| |
| * fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-273-4/+23
| | | | | | | | 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.
| * | Merge pull request #16604 from saarons/clean-remote-ip-middlewareJeremy Kemper2014-08-211-1/+15
| |\ \ | | | | | | | | ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies
| | * | Refactor ActionDispatch::RemoteIpSam Aarons2014-08-211-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 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-202-0/+2
| | | | | | | | 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 failing railties testsCarlos Antonio da Silva2014-08-191-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 Silva2014-08-191-1/+1
|
* Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-193-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 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-196-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-changelogGuillermo Iguaran2014-08-191-0/+7
|\ | | | | Mention web-console in 4.2 release notes
| * Mention web-console in 4.2 release notesGenadi Samokovarov2014-08-201-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 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-196-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 tooRafael Mendonça França2014-08-181-4/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 00:56:38 +0000