aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-212-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
| * Updated description of what engines are used forStephan Hagemann2012-09-211-2/+2
| |
| * Remove redundant 'the'.Uģis Ozols2012-09-131-1/+1
| |
* | Remove highly uncommon `config.assets.manifest` option for moving the ↵Guillermo Iguaran2012-09-191-1/+0
| | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails.
* | Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-185-15/+16
|\ \ | | | | | | Integrate strong_parameters in Rails 4
| * | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵Guillermo Iguaran2012-09-161-0/+4
| | | | | | | | | | | | attributes list isn't given
| * | Change scaffold_controller to generate and use private method to encapsulate ↵Guillermo Iguaran2012-09-162-2/+12
| | | | | | | | | | | | permissible params
| * | Remove all references to attr_accessible/protected and old ↵Guillermo Iguaran2012-09-163-13/+0
| | | | | | | | | | | | mass_assignment_sanitizers
* | | Merge pull request #5339 from gregolsen/week_start_configRafael Mendonça França2012-09-181-1/+2
|\ \ \ | | | | | | | | week_start option added to rails app config
| * | | Date.beginning_of_week thread local and beginning_of_week application config ↵gregolsen2012-09-181-1/+2
| | | | | | | | | | | | | | | | option added (default is Monday)
* | | | Remove 'assigned but unused variable' warningSteve Klabnik2012-09-181-1/+2
|/ / /
* / / Fix build for Queue.Arun Agrawal2012-09-171-1/+1
|/ /
* | Clarify the documentation on the Rails::Application#call methodDavid Czarnecki2012-09-151-2/+2
| |
* | Move queue classes to ActiveSupportSantiago Pastorino2012-09-146-122/+9
| |
* | Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-131-1/+1
|\ \ | | | | | | Implement :null_session CSRF protection method
| * | Implement :null_session CSRF protection methodSergey Nartimov2012-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does).
* | | change app/plugin generators to be more SCM agnosticDerek Prior2012-09-123-61/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of other SCM's can now generate rails apps that will add the "empty" directories to source control, but will not have a useless .gitignore or mis-named .gitkeep files. * Change `rails new` and `rails plugin new` generators to name the `.gitkeep` as `.keep` in a more SCM-agnostic way. * Change `--skip-git` option to only skip the `.gitignore` file and still generate the `.keep` files. * Add `--skip-keeps` option to skip the `.keep` files. It closes #2800.
* | | Remove the queue configuration from the environments templates since theRafael Mendonça França2012-09-122-4/+1
| | | | | | | | | | | | default is the SynchronousQueue.
* | | Use the SynchronousQueue as default in production and development.Rafael Mendonça França2012-09-122-4/+4
| | | | | | | | | | | | | | | We should not let the users use the ThreadedConsumer without know about the risks
* | | Action Mailer async flag is true by default using a Synchronous implSantiago Pastorino2012-09-113-4/+9
|/ /
* / Support MySQL SSL in rails dbconsole.needfeed2012-09-101-1/+6
|/
* require bundle in the app generatorXavier Noria2012-09-011-0/+1
| | | | | | | The app generator is not generally run under bundler, but the Bundler constant is used here. In particular you cannot create --dev apps without this.
* Use Bundler.with_clean_env instead of custom codePiotr Sarnacki2012-08-311-6/+3
|
* Revert "Revert changes related to `bundle install` fixes in `rails new`"Piotr Sarnacki2012-08-311-1/+10
| | | | | | | | The cause of the previous revert was bug in bundler that made it hard to make railties test work. Fix for bundler was recently pushed to github, so now we can safely get back to the original commit. This reverts commit 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.
* Change generators controller help from singular to plural example.Philipp Weissensteiner2012-08-281-6/+6
| | | | | | | When running `rails generate controller --help` an example with creating a (singular) "CreditCard" controller is shown. The convention is to generate controllers with plural names though.
* Raise more helpful error message on missing gemPrem Sichanugrist2012-08-241-0/+7
| | | | | | Tell people to install `activerecord-session_store` gem when it's not installed instead ofraising `NameError` on missing `ActionDispatch::Session::ActiveRecordStore`.
* Remove meta Sesion Migration generatorPrem Sichanugrist2012-08-242-16/+0
|
* Extract ActiveRecord::SessionStore from RailsPrem Sichanugrist2012-08-243-8/+0
| | | | | This functionality will be available from gem `active_record-session_store` instead.
* Fix failure on middleware/exceptions_testJosé Valim2012-08-231-1/+1
| | | | | | | The reason the test was failing was because when the test invokes `app.config`, the app is loaded and, as `eager_load` is set to true, it disables the dependency loading mechanism, so controllers that are later defined are not loaded.
* Update the ducumentation about the before_eager_load callback [ci skip]Rafael Mendonça França2012-08-221-1/+1
|
* edit secret token template comment [ci skip]Vijay Dev2012-08-231-1/+1
|
* remind user a good way to generate a secret code.Teng Siong Ong2012-08-211-0/+3
|
* Merge pull request #7225 from rails/eager_loadJosé Valim2012-08-2111-27/+65
|\ | | | | Improve eager load on Rails
| * add Rack::Lock for webrickAaron Patterson2012-08-211-0/+9
| |
| * Deprecate config.threadsafe!José Valim2012-08-211-4/+3
| |
| * Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-217-21/+18
| | | | | | | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly.
| * Remove allow_concurrency as a flagJosé Valim2012-08-212-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was mainly used to add a Rack::Lock middleware to the stack, but the only scenario the lock is desired is in development. If you are deploying on a not-threaded server, the Rack::Lock does not provide any benefit since you don't have concurrent accesses. On the other hand, if you are on a threaded server, you don't want the lock, since it defeats the purpose of using a threaded server. If there is someone out there, running on a thread server and does want a lock, it can be added to your environment as easy as: `use Rack::Lock`
| * Allow users to choose when to eager_load the application or not.José Valim2012-08-217-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the eager load behavior was mostly coupled to config.cache_classes, however this was suboptimal since in some environments a developer may want to cache classes but not necessarily load them all on boot (for example, test env). This pull request also promotes the use of config.eager_load set to true by default in production. In the majority of the cases, this is the behavior you want since it will copy most of your app into memory on boot (which was also the previous behavior). Finally, this fix a long standing Rails bug where it was impossible to access a model in a rake task when Rails was set as thread safe.
* | Merge pull request #6499 from lazylester/patch-1Carlos Antonio da Silva2012-08-211-1/+1
|\ \ | |/ |/| | | Clarify and correct the description for the --full option of the plugin_new generator. [ci skip]
| * Clarify and correct the description for the --full option of the plugin_new ↵lazylester2012-08-211-1/+1
| | | | | | | | generator
* | fix punctuation in config templatesFrancesco Rodriguez2012-08-207-12/+12
| |
* | Update to activerecord-deprecated_finders on generatorMiguel Herranz2012-08-171-2/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-161-2/+20
|\ \
| * | copy edits [ci skip]Vijay Dev2012-08-161-7/+6
| | |
| * | Add extra documentation to the locale file.Steve Klabnik2012-08-041-2/+21
| | |
* | | We don't need to require AS::TestCaseSteve Klabnik2012-08-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was only needed due to https://github.com/rails/rails/blob/6591a10b1f6eccc91bc01ab708050884058e9665/railties/lib/rails/console_app.rb#L6 We don't need that on master. Fixes #6907.
* | | oops, should be directoryAaron Patterson2012-08-131-1/+1
| | |
* | | speed up cache directory creationAaron Patterson2012-08-131-3/+9
| | | | | | | | | | | | | | | | | | Let Rake control the cache directories. If the directory already exists, rake will skip creating it (vs the previous task which would always try to mkdir_p)
* | | Move AD default_headers configurations to railtieGuillermo Iguaran2012-08-101-5/+0
| | | | | | | | | | | | | | | | | | ActionDispatch railtie is a better place for config.action_dispatch.default_headers settings, users can continue overriding those settings in their configuration files if needed.
* | | Fix handling SCRIPT_NAME from within mounted engine'sPiotr Sarnacki2012-08-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you mount your application at a path, for example /myapp, server should set SCRIPT_NAME to /myapp. With such information, rails application knows that it's mounted at /myapp path and it should generate routes relative to that path. Before this patch, rails handled SCRIPT_NAME correctly only for regular apps, but it failed to do it for mounted engines. The solution was to hardcode default_url_options[:script_name], which is not the best answer - it will work only when application is mounted at a fixed path. This patch fixes the situation by respecting original value of SCRIPT_NAME when generating application's routes from engine and the other way round - when you generate engine's routes from application. This is done by using one of 2 pieces of information in env - current SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because we have 2 cases to handle: - generating engine's route from application: in this situation SCRIPT_NAME is basically SCRIPT_NAME set by the server and it indicates the place where application is mounted, so we can just pass it as :original_script_name in url_options. :original_script_name is used because if we use :script_name, router will ignore generating prefix for engine - generating application's route from engine: in this situation we already lost information about the SCRIPT_NAME that server used. For example if application is mounted at /myapp and engine is mounted at /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that we need to keep reference to /myapp SCRIPT_NAME by binding it to the current router. Later on we can extract it and use when generating url Please note that starting from now you *should not* use default_url_options[:script_name] explicitly if your server already passes correct SCRIPT_NAME to rack env. (closes #6933)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:29:51 +0000