Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7854 from guilleiguaran/extract-rack-cache | Rafael Mendonça França | 2012-10-05 | 1 | -0/+2 |
|\ | | | | | Fix middleware cache tests enabling rack_cache | ||||
| * | Fix middleware cache tests enabling rack_cache | Guillermo Iguaran | 2012-10-05 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #7852 from rochefort/fix-example | Jeremy Kemper | 2012-10-05 | 1 | -1/+1 |
|\ | | | | | fix Example: Rename tools/profile_requires -> tools/profile | ||||
| * | fix Example: Rename tools/profile_requires -> tools/profile | rochefort | 2012-10-06 | 1 | -1/+1 |
|/ | |||||
* | Revert "Use flat_map { } instead of map {}.flatten" | Santiago Pastorino | 2012-10-05 | 17 | -26/+26 |
| | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]] | ||||
* | Use flat_map { } instead of map {}.flatten | Santiago Pastorino | 2012-10-05 | 17 | -26/+26 |
| | |||||
* | Fix the coffee-rails dependecy version | Rafael Mendonça França | 2012-10-05 | 1 | -1/+2 |
| | |||||
* | Merge pull request #7838 from guilleiguaran/extract-rack-cache | Santiago Pastorino | 2012-10-04 | 6 | -11/+33 |
|\ | | | | | Disable Rack::Cache by default | ||||
| * | Update CHANGELOG entry about rack-cache extract | Guillermo Iguaran | 2012-10-04 | 1 | -3/+7 |
| | | |||||
| * | Comment rack-cache entry on Gemfile | Guillermo Iguaran | 2012-10-04 | 1 | -1/+1 |
| | | |||||
| * | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 4 | -7/+25 |
|/ | |||||
* | Use String#exclude? to make sure that Active Support is not loaded when | Rafael Mendonça França | 2012-10-04 | 1 | -1/+1 |
| | | | | | | | bare is true. We need to change this since coffee-rails loads ActionView that loads core_ext/array/access. | ||||
* | Remove action cache related tests | Rafael Mendonça França | 2012-10-04 | 1 | -42/+0 |
| | |||||
* | Strip heredoc to not generate the Gemfile with trailing spaces | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 |
| | |||||
* | Add turbolinks as development dependency | Rafael Mendonça França | 2012-10-04 | 1 | -0/+1 |
| | |||||
* | Remove unneeded CHANGELOG entry. | Rafael Mendonça França | 2012-10-04 | 1 | -3/+0 |
| | | | | | | | This was added in Rails 4 and we don't need changelog entries to behavior changes [ci skip] | ||||
* | Merge pull request #7847 from bloudermilk/recursive_permit | David Heinemeier Hansson | 2012-10-04 | 3 | -0/+15 |
|\ | | | | | ActionController::Parameters#permit! is recursive | ||||
| * | ActionController::Parameters#permit! is recursive | Brendan Loudermilk | 2012-10-04 | 3 | -0/+15 |
| | | |||||
* | | Do not set removed option | Rafael Mendonça França | 2012-10-04 | 1 | -1/+0 |
| | | | | | | | | | | Sine page caching was remove from the core we don't have the page_cache_directory anymore | ||||
* | | Turn turbolinks on by default for new apps | David Heinemeier Hansson | 2012-10-04 | 3 | -4/+11 |
|/ | |||||
* | Merge pull request #7833 from frodsan/extract_ap_pages_actions_caching | Rafael Mendonça França | 2012-10-04 | 8 | -1138/+65 |
|\ | | | | | Extract AP Page and Action caching from Rails | ||||
| * | add an entry about AP page and action extraction in the upgrading guide [ci ↵ | Francesco Rodriguez | 2012-10-04 | 1 | -0/+7 |
| | | | | | | | | skip] | ||||
| * | add CHANGELOG entry for AP page and action caching extraction [ci skip] | Francesco Rodriguez | 2012-10-04 | 1 | -0/+11 |
| | | |||||
| * | rename page_cache_extension option to default_static_extension | Francesco Rodriguez | 2012-10-03 | 3 | -11/+28 |
| | | |||||
| * | extract AP Page and Action caching to actionpack-deprecated_caching gem | Francesco Rodriguez | 2012-10-03 | 5 | -1138/+30 |
| | | |||||
* | | Merge pull request #7846 from ahaymond/master | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 |
|\ \ | | | | | | | Updated comments for [ci skip] | ||||
| * | | Update activerecord/lib/active_record/persistence.rb | Adam Haymond | 2012-10-04 | 1 | -2/+2 |
|/ / | | | | | - Changed the comments documentation for the update_column(s) methods to add a little bit of clarity | ||||
* | | Merge pull request #7769 from rgarver/feature/public-fragment_name_with_digest | David Heinemeier Hansson | 2012-10-04 | 1 | -11/+12 |
|\ \ | | | | | | | Move the CacheHelper#fragment_name_with_digest to be public | ||||
| * | | Add nodoc to now public fragment_name_with_digest | Ryan Garver | 2012-10-04 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-04 | 14 | -10/+122 |
| |\ \ | |/ / |/| | | |||||
* | | | Fix CHANGELOG entry [ci skip] | Rafael Mendonça França | 2012-10-04 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #6978 from frodsan/count_nosql_unsaved_parent | Rafael Mendonça França | 2012-10-03 | 5 | -0/+37 |
|\ \ \ | |_|/ |/| | | Count returns 0 without querying if parent is not saved | ||||
| * | | Count returns 0 without querying if parent is not saved | Francesco Rodriguez | 2012-10-03 | 5 | -0/+37 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patches `CollectionAssociation#count` to return 0 without querying if the parent record is new. Consider the following code: class Account has_many :dossiers end class Dossier belongs_to :account end a = Account.new a.dossiers.build # before patch a.dossiers.count # SELECT COUNT(*) FROM "dossiers" WHERE "dossiers"."account_id" IS NULL # => 0 # after a.dosiers.count # fires without sql query # => 0 Fixes #1856. | ||||
* | | Refactor | Santiago Pastorino | 2012-10-03 | 1 | -5/+4 |
| | | |||||
* | | Use the `flat_map` method. | Rafael Mendonça França | 2012-10-03 | 1 | -2/+2 |
| | | | | | | | | Thanks to @jeremy to teach me this one. | ||||
* | | Revert "Merge pull request #7826 from sikachu/master-validators-kind" | Rafael Mendonça França | 2012-10-02 | 3 | -32/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e9f53f9736544f070e75e516c71137b7eb49a7a, reversing changes made to 6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9. Revert "Don't use tap in this case." This reverts commit 454d820bf0a18fe1db4c55b0145197d70fef1f82. Reason: Is not a good idea to add options to this method since we can do the same thing using method composition. Person.validators_on(:name).select { |v| v.kind == :presence } Also it avoids to change the method again to add more options. | ||||
* | | Don't use tap in this case. | Rafael Mendonça França | 2012-10-02 | 1 | -5/+7 |
| | | | | | | | | | | The use of tap in this case is very confusing since we are mutating the return value inside the block | ||||
* | | Merge pull request #7826 from sikachu/master-validators-kind | Rafael Mendonça França | 2012-10-02 | 3 | -1/+30 |
|\ \ | | | | | | | Make `.validators_on` accept `:kind` option | ||||
| * | | Make `.validators_on` accept `:kind` option | Prem Sichanugrist | 2012-10-02 | 3 | -1/+30 |
| | | | | | | | | | | | | | | | This will filter out the validators on a particular attribute based on its kind. | ||||
* | | | Merge pull request #7825 from sikachu/master-rails-pathname | Rafael Mendonça França | 2012-10-02 | 3 | -2/+12 |
|\ \ \ | |/ / |/| | | Make Rails.public_path return a Pathname | ||||
| * | | Make Rails.public_path return a Pathname | Prem Sichanugrist | 2012-10-02 | 3 | -2/+12 |
|/ / | |||||
* | | Merge pull request #6952 from NZKoz/key_generator | Michael Koziarski | 2012-10-02 | 5 | -1/+67 |
|\ \ | | | | | | | 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 | ||||
| * | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2 | Michael Koziarski | 2012-10-01 | 3 | -0/+56 |
| | | | | | | | | | | | | | | | | | | This will be used to derive keys from the secret and a salt, in order to allow us to do things like encrypted cookie stores without using the secret for multiple purposes directly. | ||||
| | * | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-02 | 92 | -650/+1086 |
| | |\ | |_|/ |/| | | |||||
* | | | fix warning: method redefined | kennyj | 2012-10-02 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through | Rafael Mendonça França | 2012-10-02 | 5 | -4/+28 |
|\ \ \ | | | | | | | | | Fix reset_counters crashing on has_many :through associations. | ||||
| * | | | Fix reset_counters() crashing on has_many :through associations. | lulalala | 2012-10-02 | 5 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | The counter column name in the intermediate model need to be access via the through reflection. | ||||
* | | | | Merge pull request #7636 from steveklabnik/issue_5660 | Rafael Mendonça França | 2012-10-01 | 3 | -3/+21 |
|\ \ \ \ | | | | | | | | | | | Fixes issue #5660: Failsafe exception returns text/html and text/plain. | ||||
| * | | | | Failsafe exception returns text/plain. | Steve Klabnik | 2012-10-01 | 3 | -3/+21 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | It's best to just return text/plain when something has gone terribly wrong. Fixes #5660. |