| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #6952 from NZKoz/key_generator | Michael Koziarski | 2012-10-02 | 2 | -1/+11 | |
| |\ \ | | | | | | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2 | |||||
| | * | | Provide access to the application's KeyGenerator | Michael Koziarski | 2012-10-01 | 2 | -1/+11 | |
| | | | | | | | | | | | | | Available both as an env entry for rack and an instance method on Rails::Application for other uses | |||||
| * | | | Merge pull request #7794 from guilleiguaran/extract-rack-cache | Santiago Pastorino | 2012-10-01 | 3 | -0/+15 | |
| |\ \ \ | | | | | | | | | Use Rack::Cache middleware only if is in Gemfile | |||||
| | * | | | Add rack-cache to default Gemfile | Guillermo Iguaran | 2012-10-01 | 2 | -0/+9 | |
| | | | | | ||||||
| | * | | | Use Rack::Cache middleware only if is in Gemfile | Guillermo Iguaran | 2012-10-01 | 1 | -0/+6 | |
| | |/ / | ||||||
| * | | | Fix broken scaffold routes test | Jeremy Walker | 2012-10-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fixed generated whitespace in routes when using namespaced resource. | Jeremy Walker | 2012-09-29 | 2 | -6/+115 | |
| |/ / | ||||||
| * / | Assets cache shouldn't be shared between different environments | Guillermo Iguaran | 2012-09-28 | 3 | -3/+6 | |
| |/ | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-28 | 1 | -3/+0 | |
| |\ | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| | * | Revert "add documentation to generated routes" | Vijay Dev | 2012-09-28 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | This reverts commit bfafa999ddaa203224ac0222203517a0d2a3f6bf. Changes in templates aren't allowed in docrails. [ci skip] | |||||
| | * | add documentation to generated routes | schneems | 2012-09-24 | 1 | -1/+2 | |
| | | | | | | | Mention that in addition to `rake routes` a developer can also visit `/rails/info/routes` in the browser. | |||||
| | * | remove misleading comment in Rakefile | schneems | 2012-09-24 | 1 | -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 Kemper | 2012-09-26 | 2 | -21/+30 | |
| | | | | | | | | | logs. | |||||
| * | | Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵ | Jeremy Kemper | 2012-09-25 | 1 | -1/+2 | |
| | | | | | | | | | the same line | |||||
| * | | Only apply log tags if the logger supports it | Jeremy Kemper | 2012-09-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove of an extra line in template configuration file. | Geoffrey Roguelon | 2012-09-24 | 1 | -1/+0 | |
| | | | ||||||
| * | | Update test to match new non-sorting of attributes. | Brian Morearty | 2012-09-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Removed sorting of attribute names in controller generator. | Brian Morearty | 2012-09-23 | 1 | -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-rails | Guillermo Iguaran | 2012-09-21 | 1 | -2/+5 | |
| | | | ||||||
| * | | Remove .rb from require sentences | José Corcuera Z | 2012-09-21 | 2 | -2/+2 | |
| |/ | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 2 | -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 for | Stephan Hagemann | 2012-09-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | Remove redundant 'the'. | Uģis Ozols | 2012-09-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove highly uncommon `config.assets.manifest` option for moving the ↵ | Guillermo Iguaran | 2012-09-19 | 2 | -1/+5 | |
| | | | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails. | |||||
| * | | Update changelogs to add entries about strong_parameters integration | Guillermo Iguaran | 2012-09-19 | 1 | -0/+11 | |
| | | | ||||||
| * | | Use last version of sprockets-rails and syncing tests for assets. | Dmitry Vorotilin | 2012-09-19 | 1 | -32/+35 | |
| | | | ||||||
| * | | In development and test we drain the jobs in the same thread. | Rafael Mendonça França | 2012-09-18 | 1 | -4/+4 | |
| | | | ||||||
| * | | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 12 | -63/+47 | |
| |\ \ | | | | | | | Integrate strong_parameters in Rails 4 | |||||
| | * | | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+22 | |
| | | | | | | | | | | | | | StrongParameters protection | |||||
| | * | | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 | |
| | | | | | | | | | | | | | attributes list isn't given | |||||
| | * | | config.activerecord.whitelist_attributes isn't used anymore, remove ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -3/+0 | |
| | | | | | | | | | | | | | reference from abstract_unit | |||||
| | * | | Remove configuration test for config.activerecord.whitelist_attributes | Guillermo Iguaran | 2012-09-16 | 1 | -13/+0 | |
| | | | | ||||||
| | * | | Remove attributes whitelist tests from AppGenerator tests | Guillermo Iguaran | 2012-09-16 | 1 | -6/+0 | |
| | | | | ||||||
| | * | | Change scaffold_controller to generate and use private method to encapsulate ↵ | Guillermo Iguaran | 2012-09-16 | 4 | -8/+21 | |
| | | | | | | | | | | | | | permissible params | |||||
| | * | | Remove all references to attr_accessible/protected and old ↵ | Guillermo Iguaran | 2012-09-16 | 6 | -33/+0 | |
| | | | | | | | | | | | | | mass_assignment_sanitizers | |||||
| * | | | Merge pull request #5339 from gregolsen/week_start_config | Rafael Mendonça França | 2012-09-18 | 2 | -1/+24 | |
| |\ \ \ | | | | | | | | | week_start option added to rails app config | |||||
| | * | | | Date.beginning_of_week thread local and beginning_of_week application config ↵ | gregolsen | 2012-09-18 | 2 | -1/+24 | |
| | | | | | | | | | | | | | | | | | option added (default is Monday) | |||||
| * | | | | Remove 'assigned but unused variable' warning | Steve Klabnik | 2012-09-18 | 1 | -1/+2 | |
| |/ / / | ||||||
| * / / | Fix build for Queue. | Arun Agrawal | 2012-09-17 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Clarify the documentation on the Rails::Application#call method | David Czarnecki | 2012-09-15 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix syntax error in assert_match | Rafael Mendonça França | 2012-09-15 | 1 | -6/+6 | |
| | | | ||||||
| * | | Few more warnings removed. | Arun Agrawal | 2012-09-15 | 1 | -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 ActiveSupport | Santiago Pastorino | 2012-09-14 | 12 | -366/+20 | |
| | | | ||||||
| * | | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 2 | -1/+83 | |
| |\ \ | | | | | | | Implement :null_session CSRF protection method | |||||
| | * | | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 2 | -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 agnostic | Derek Prior | 2012-09-12 | 6 | -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 the | Rafael Mendonça França | 2012-09-12 | 2 | -4/+1 | |
| | | | | | | | | | | | | | default is the SynchronousQueue. | |||||
| * | | | Allow users to configure the queue for the mailers | Rafael Mendonça França | 2012-09-12 | 1 | -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ça | 2012-09-12 | 3 | -9/+10 | |
| | | | | | | | | | | | | | | | | We should not let the users use the ThreadedConsumer without know about the risks | |||||
| * | | | fixed support for DATABASE_URL for rake db tasks | Grace Liu | 2012-09-11 | 3 | -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). | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |