Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Merge pull request #5373 from nertzy/fix_comments_about_to_partial_path | José Valim | 2012-03-11 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments about to_partial_path | |||||
| | * | | | | | | | | | | | Fix comments about to_partial_path | Grant Hutchins | 2012-03-10 | 2 | -3/+3 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 4 | -9/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | configure how unverified request will be handled | |||||
| | * | | | | | | | | | | configure how unverified request will be handled | Sergey Nartimov | 2012-03-09 | 4 | -9/+37 | |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception | |||||
| * | | | | | | | | | | @controller already includes url_helpers in with_routing method | Santiago Pastorino | 2012-03-10 | 1 | -1/+0 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add missing require | Santiago Pastorino | 2012-03-10 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix broken tests | Santiago Pastorino | 2012-03-10 | 2 | -1/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5371 from jsl/fix_actionmailer_tests | José Valim | 2012-03-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix actionmailer tests broken by #4751a69 | |||||
| | * | | | | | | | | | | Fix actionmailer tests broken by #4751a69 | Justin S. Leitgeb | 2012-03-10 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 2 | -3/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5367 from carlosantoniodasilva/middleware-api | Santiago Pastorino | 2012-03-10 | 5 | -24/+67 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | Change api_only to http_only and add MiddlewareStackProxy docs | |||||
| | * | | | | | | | | | Change api_only to http_only | Carlos Antonio da Silva | 2012-03-10 | 5 | -21/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
| | * | | | | | | | | | Add some docs for MiddlewareStackProxy methods and api_only! | Carlos Antonio da Silva | 2012-03-10 | 3 | -5/+49 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
| * | | | | | | | | | Merge pull request #5364 from ↵ | José Valim | 2012-03-10 | 2 | -24/+18 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | carlosantoniodasilva/active-model-serialization-include Active model serialization :include returning string keys | |||||
| | * | | | | | | | | Rename variable to avoid using name "include" | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better syntax highlight :) | |||||
| | * | | | | | | | | Remove Array#wrap usage in AMo serialization | Carlos Antonio da Silva | 2012-03-09 | 1 | -2/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Make sure serializable hash with :include always returns string keys | Carlos Antonio da Silva | 2012-03-09 | 2 | -15/+14 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Install latest bundler on Travis. | José Valim | 2012-03-09 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Bump bundler dependency. | José Valim | 2012-03-09 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5356 from carlosantoniodasilva/rake-test-system | José Valim | 2012-03-09 | 4 | -106/+98 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use one system call whenever possible, group rake and Dir.chdir calls | |||||
| | * | | | | | | | | Use one system call whenever possible, group rake and Dir.chdir calls | Carlos Antonio da Silva | 2012-03-08 | 4 | -106/+98 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5352 from avakhov/ar_finder_sql_uniq_ids | José Valim | 2012-03-09 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] correct | |||||
| | * | | | | | | | | | In AR depths use &:to_i before :uniq to process mixed arrays likes ["1", 1] ↵ | Alexey Vakhov | 2012-03-09 | 2 | -1/+8 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct | |||||
| * | | | | | | | | | Merge pull request #5351 from shanna/master | José Valim | 2012-03-08 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Missing active_model/naming.rb dependency. | |||||
| | * | | | | | | | | | Added missing ActiveModel::Naming dependency. | Shane Hanna | 2012-03-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Name constructor expects to be able to call #blank? on a String but the core Object#blank? extension is never required. | |||||
| * | | | | | | | | | | Minor changelog fixes [ci skip] | Vijay Dev | 2012-03-09 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5349 from rafaelfranca/changelog-fix | Vijay Dev | 2012-03-08 | 7 | -10/+59 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix my name in the CHANGELOG to follow the convention | |||||
| | * | | | | | | | | | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -10/+59 | |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add missing entries and use the formating convention | |||||
| * | | | | | | | | | | Merge pull request #5348 from rafaelfranca/fix-warning | Vijay Dev | 2012-03-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | Remove warning of unused variable | |||||
| | * | | | | | | | | | Remove warning of unused variable | Rafael Mendonça França | 2012-03-08 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 2 | -7/+39 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | use for the current thread. fixes #5330 | |||||
| * | | | | | | | | fix incorrect changelog headings [ci skip]. | Vijay Dev | 2012-03-09 | 3 | -25/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last commit message should not have said 'Rails 4' either | |||||
| * | | | | | | | | changelog updates for Rails 4 [ci skip] | Vijay Dev | 2012-03-09 | 4 | -1/+27 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Revised description for responds_with | Mark Thomson | 2012-03-17 | 1 | -19/+115 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-13 | 9 | -49/+86 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [config guide] Add mass_assignment_sanitizer to Active Record config options | Ryan Bigg | 2012-03-12 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'original_repo/master' | Avi Tzurel | 2012-03-12 | 11 | -117/+208 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add engines guide to documents.yaml | Ryan Bigg | 2012-03-11 | 1 | -0/+4 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | [instrumentation] Add further action placeholders | Ryan Bigg | 2012-03-11 | 1 | -0/+12 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | [instrumentation guide] Cover deliver.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+18 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | [instrumentation guide] Cover receive.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+27 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an ↵ | Michael de Silva | 2012-03-11 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password" | |||||
| | * | | | | | | | | attr_accessor_with_default was deprecated and removed. | Andrew France | 2012-03-11 | 1 | -49/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae. | |||||
| * | | | | | | | | | Squash commits into a single commit | Avi Tzurel | 2012-03-11 | 1 | -0/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Added documentation for the ActionController::MimeResponds::Collector class. | Mark Thomson | 2012-03-13 | 1 | -1/+24 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Revised explanation of fields_for usage. | Mark Thomson | 2012-03-11 | 1 | -10/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble | |||||
* | | | | | | | | | added clarification stating the counter_cache attribute needs to be created ↵ | Michael de Silva | 2012-03-11 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the associate class via a migration |