aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-281-3/+0
|\ | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * Revert "add documentation to generated routes"Vijay Dev2012-09-281-2/+1
| | | | | | | | | | | | | | | | This reverts commit bfafa999ddaa203224ac0222203517a0d2a3f6bf. Changes in templates aren't allowed in docrails. [ci skip]
| * add documentation to generated routesschneems2012-09-241-1/+2
| | | | | | Mention that in addition to `rake routes` a developer can also visit `/rails/info/routes` in the browser.
| * remove misleading comment in Rakefileschneems2012-09-241-3/+0
| | | | | | Comment introduced in https://github.com/rails/rails/commit/bbb3e5a8 before rake `isolate:test` was even introduced https://github.com/rails/rails/commit/bbb3e5a8
* | Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-262-21/+30
| | | | | | | | logs.
* | Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵Jeremy Kemper2012-09-251-1/+2
| | | | | | | | the same line
* | Only apply log tags if the logger supports itJeremy Kemper2012-09-241-1/+1
| |
* | Remove of an extra line in template configuration file.Geoffrey Roguelon2012-09-241-1/+0
| |
* | Update test to match new non-sorting of attributes.Brian Morearty2012-09-231-1/+1
| |
* | Removed sorting of attribute names in controller generator.Brian Morearty2012-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe when people use generators, they typically order the parameters on the command line in an order that makes sense to them. Sorting them in the generated code makes the order seem more arbitrary to humans, even though it's less arbitrary to computers. :-) Example: rails g scaffold Post title:string content:text The human chose to put title before content. Sorted attributes in the generated code work but don't match the human's intent: params.require(:posts).permit(:content, :title)
* | Update asset test to match one in sprockets-railsGuillermo Iguaran2012-09-211-2/+5
| |
* | Remove .rb from require sentencesJosé Corcuera Z2012-09-212-2/+2
|/
* 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-192-1/+5
| | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails.
* | Update changelogs to add entries about strong_parameters integrationGuillermo Iguaran2012-09-191-0/+11
| |
* | Use last version of sprockets-rails and syncing tests for assets.Dmitry Vorotilin2012-09-191-32/+35
| |
* | In development and test we drain the jobs in the same thread.Rafael Mendonça França2012-09-181-4/+4
| |
* | Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-1812-63/+47
|\ \ | | | | | | Integrate strong_parameters in Rails 4
| * | Add config.action_controller.permit_all_attributes to bypass ↵Guillermo Iguaran2012-09-161-0/+22
| | | | | | | | | | | | StrongParameters protection
| * | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵Guillermo Iguaran2012-09-161-0/+4
| | | | | | | | | | | | attributes list isn't given
| * | config.activerecord.whitelist_attributes isn't used anymore, remove ↵Guillermo Iguaran2012-09-161-3/+0
| | | | | | | | | | | | reference from abstract_unit
| * | Remove configuration test for config.activerecord.whitelist_attributesGuillermo Iguaran2012-09-161-13/+0
| | |
| * | Remove attributes whitelist tests from AppGenerator testsGuillermo Iguaran2012-09-161-6/+0
| | |
| * | Change scaffold_controller to generate and use private method to encapsulate ↵Guillermo Iguaran2012-09-164-8/+21
| | | | | | | | | | | | permissible params
| * | Remove all references to attr_accessible/protected and old ↵Guillermo Iguaran2012-09-166-33/+0
| | | | | | | | | | | | mass_assignment_sanitizers
* | | Merge pull request #5339 from gregolsen/week_start_configRafael Mendonça França2012-09-182-1/+24
|\ \ \ | | | | | | | | week_start option added to rails app config
| * | | Date.beginning_of_week thread local and beginning_of_week application config ↵gregolsen2012-09-182-1/+24
| | | | | | | | | | | | | | | | 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
| |
* | 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.