aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Fix syntax error in assert_matchRafael Mendonça França2012-09-151-6/+6
|
* Few more warnings removed.Arun Agrawal2012-09-151-3/+3
| | | | | | | I found them when I was running warning mode on with railties See https://github.com/rails/rails/pull/3782
* Move queue classes to ActiveSupportSantiago Pastorino2012-09-1412-366/+20
|
* Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-132-1/+83
|\ | | | | Implement :null_session CSRF protection method
| * Implement :null_session CSRF protection methodSergey Nartimov2012-09-132-1/+83
| | | | | | | | | | | | | | | | 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-126-65/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end
* | Use the SynchronousQueue as default in production and development.Rafael Mendonça França2012-09-123-9/+10
| | | | | | | | | | We should not let the users use the ThreadedConsumer without know about the risks
* | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-113-0/+215
| | | | | | | | | | | | | | | | | | | | | | | | - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified).
* | Action Mailer async flag is true by default using a Synchronous implSantiago Pastorino2012-09-113-4/+9
|/
* Merge pull request #7488 from needfeed/masterRafael Mendonça França2012-09-112-1/+9
|\ | | | | Have rails dbconsole pass sslca to the mysql command line client.
| * Support MySQL SSL in rails dbconsole.needfeed2012-09-102-1/+9
| |
* | Rake assets:precompile shouldn't fail quietly.Dmitry Vorotilin2012-09-111-7/+4
|/ | | | We should show to user original issue if rake task will be aborted.
* &#39 dates back to SGML when &#x27 was introduced in HTML 4.0Kalys Osmonov2012-09-091-2/+2
|
* add mini-validator on creating migrationJan Bernacki2012-09-061-0/+7
| | | | move validation to AR
* 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.
* Don't use Gemfile in test application in railtiesPiotr Sarnacki2012-08-311-5/+5
| | | | | | | | | | | | | Option to run `bundle install` after generating new appplication was added recently to rails. Since introduction, it contained a subtle bug that caused it to use `Gemfile` from current directory (if it exists) rather than from generated directory. This also accidentaly caused railties tests to work without any problems - after generating test app it just used `Gemfile` from the repository, rather than the one in generated app. After fixing the bug mentioned above, this of course broke. The easiest way to bypass that is to not generate a `Gemfile` for test application - with such setup Bundler will just use first available `Gemfile` in one of the parent directories.
* 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-312-3/+17
| | | | | | | | 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.
* CHANGELOGs are now per branchXavier Noria2012-08-281-2479/+1
| | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history.
* Remove unused require.kennyj2012-08-292-3/+0
|
* Fixes wrong test class names.kennyj2012-08-294-4/+4
|
* 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-242-0/+26
| | | | | | 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-245-55/+0
| | | | | This functionality will be available from gem `active_record-session_store` instead.
* Fix failure on middleware/exceptions_testJosé Valim2012-08-232-11/+5
| | | | | | | 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
|
* before_eager_load only runs when eager_load is trueRafael Mendonça França2012-08-221-4/+4
|
* 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
|
* Remove app building setup/teardown for remote ip railtie testsCarlos Antonio da Silva2012-08-211-14/+0
| | | | | These tests rely on "make_basic_app", which is a faster version that does not need to create the whole app directory structure.
* Set eager load option in "make_basic_app" for railties testsCarlos Antonio da Silva2012-08-211-0/+1
| | | | Avoid output with config option not set when running some tests.
* Merge pull request #7225 from rails/eager_loadJosé Valim2012-08-2116-57/+102
|\ | | | | Improve eager load on Rails
| * add Rack::Lock for webrickAaron Patterson2012-08-211-0/+9
| |
| * Deprecate config.threadsafe!José Valim2012-08-213-16/+14
| |
| * Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-219-38/+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-214-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-219-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |