| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Improved testing so that it tests the real functionality and not the private ↵ | Philippe Huibonhoa | 2011-10-02 | 1 | -4/+5 | |
| | | | | | | | | | | | | | method. | |||||
| | * | | Added fix so that file store does not raise an exception when cache dir does ↵ | Philippe Huibonhoa | 2011-09-29 | 2 | -0/+8 | |
| | | | | | | | | | | | | | not exist yet. This can happen if a delete_matched is called before anything is saved in the cache. | |||||
| * | | | TestCase should respect the view_assigns API instead of pulling variables on ↵ | José Valim | 2011-10-02 | 3 | -8/+23 | |
| | | | | | | | | | | | | | its own. | |||||
| * | | | Update CHANGELOG. | José Valim | 2011-10-02 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge pull request #2583 from guilleiguaran/railsrc | José Valim | 2011-10-02 | 2 | -0/+14 | |
| |\ \ \ | | | | | | | | | Read extra args for 'rails new' from ~/.railsrc | |||||
| | * | | | Print information about .railsrc to users | Guillermo Iguaran | 2011-10-02 | 2 | -0/+7 | |
| | | | | | ||||||
| | * | | | Read extra args for 'rails new' from ~/.railsrc | Guillermo Iguaran | 2011-10-02 | 1 | -0/+7 | |
| |/ / / | ||||||
| * | | | Merge pull request #3185 from arunagw/void_context_warnings_removed | José Valim | 2011-10-01 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Use of :: in void context Warning removed | |||||
| | * | | | Use of :: in void context Warning removed | Arun Agrawal | 2011-10-01 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures | José Valim | 2011-09-30 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Modified how to handle if ActiveRecord is defined. | |||||
| | * | | | Modified how to handle if ActiveRecord is defined. | Yasuo Honda | 2011-09-30 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Provide read_attribute_for_serialization as the API to serialize attributes. | José Valim | 2011-09-30 | 3 | -5/+30 | |
| | | | | ||||||
| * | | | Set the default options value for as_json in the encoder object. | José Valim | 2011-09-30 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Merge pull request #3175 from nhocki/as-json-patch | José Valim | 2011-09-30 | 2 | -1/+11 | |
| |\ \ \ | | | | | | | | | Allow default options for `as_json` method on models | |||||
| | * | | | Fixing `as_json` method for ActiveRecord models. | Nicolás Hock Isaza | 2011-09-29 | 2 | -1/+11 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case. | |||||
| * | | | Merge pull request #3177 from arunagw/void_warnings_removed | José Valim | 2011-09-30 | 1 | -4/+4 | |
| |\ \ \ | | | | | | | | | possibly useless use of :: in void context Warning removed | |||||
| | * | | | possibly useless use of :: in void context Warning removed | Arun Agrawal | 2011-09-30 | 1 | -4/+4 | |
| | |/ / | ||||||
| * | | | Merge pull request #3178 from arunagw/argument_warning_removed | José Valim | 2011-09-30 | 1 | -1/+1 | |
| |\ \ \ | |/ / |/| | | warning removed : '&' interpreted as argument prefix | |||||
| | * | | warning removed : '&' interpreted as argument prefix | Arun Agrawal | 2011-09-30 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Add CHANGELOG entries | Santiago Pastorino | 2011-09-29 | 3 | -1/+67 | |
| | | | ||||||
| * | | Don't call self.class unless necessary. Closes #3171. | Jon Leighton | 2011-09-29 | 2 | -2/+3 | |
| | | | ||||||
| * | | Merge pull request #3167 from ↵ | José Valim | 2011-09-29 | 2 | -1/+17 | |
| |\ \ | | | | | | | | | | | | | dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions | |||||
| | * | | Honour RAILS_ENV environment variable when running rake. | Dmitriy Kiriyenko | 2011-09-29 | 2 | -1/+17 | |
| |/ / | ||||||
| * | | javascript_path and stylesheet_path should honor the asset pipelining | Santiago Pastorino | 2011-09-28 | 2 | -2/+28 | |
| | | | ||||||
| * | | Merge pull request #3159 from elliterate/digest_auth_with_query_string | José Valim | 2011-09-28 | 2 | -1/+10 | |
| |\ \ | | | | | | | Fixed digest authentication for requests with a query string [#3158] | |||||
| | * | | Fixed digest authentication for requests with a query string [#3158] | Colin Shield & Ian Lesperance | 2011-09-28 | 2 | -1/+10 | |
| | | | | ||||||
| * | | | Merge pull request #3156 from ihower/enhance_button_to_helper_v2 | Santiago Pastorino | 2011-09-28 | 2 | -5/+19 | |
| |\ \ \ | |/ / |/| | | Make button_to helper support "form" option | |||||
| | * | | Make button_to helper support "form" option which is the form attributes. | Wen-Tien Chang | 2011-09-29 | 2 | -5/+19 | |
| | | | | ||||||
| * | | | partial pass over the assets guide | Xavier Noria | 2011-09-28 | 1 | -15/+12 | |
| |/ / | ||||||
| * | | fixing typo in assets guide | Vijay Dev | 2011-09-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-test | Jon Leighton | 2011-09-28 | 2 | -2/+2 | |
| |\ \ | | | | | | | Fixed failed test under 1.8.7 as map.keys order in indeterminable | |||||
| | * | | Fixed failed test under 1.8.7 as map.keys order in indeterminable | Rocky Jaiswal | 2011-09-28 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require | Santiago Pastorino | 2011-09-27 | 1 | -0/+1 | |
| |\ \ | | | | | | | add missing require to html sanitizer | |||||
| | * | | add missing require to html sanitizer | Alexey Vakhov | 2011-09-27 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | the infamous detail only spotted in GitHub diffs no matter how careful you ↵ | Xavier Noria | 2011-09-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | were before pushing | |||||
| * | | | partial pass over the asset pipeline | Xavier Noria | 2011-09-27 | 1 | -14/+17 | |
| |/ / | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-28 | 6 | -7/+32 | |
| |\ \ | ||||||
| | * | | copy edit d47c2c4 | Vijay Dev | 2011-09-28 | 1 | -7/+1 | |
| | | | | ||||||
| | * | | fixing docs for delete_sql where quotes should be used in this example. | Diego Plentz | 2011-09-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Alert about the new Bundler require for asset gems | Nicolás Hock Isaza | 2011-09-26 | 1 | -1/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you are coming from a Rails 3.0 application, you won't have the correct Bundler require statement. This will cause the gems under the `assets` group not to be available in the development and production environment. I think this is related to the issue #39 in rails-sass https://github.com/rails/sass-rails/issues/39 | |||||
| | * | | update ActionMailer example using last truncate helper method signature | Alexey Vakhov | 2011-09-26 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | fix ActionMailer readme example | Alexey Vakhov | 2011-09-26 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Fixed typo that I added - doh. | Chris Kimpton | 2011-09-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Clarify that the Active Record config should just work automatically | Chris Kimpton | 2011-09-26 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | add some notes on setup for Active Record tests | Chris Kimpton | 2011-09-26 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | pluralize "locales" since that's what's used in other parts of the document, ↵ | Waynn Lue | 2011-09-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | and add a missing "on" | |||||
| | * | | Changed "en-UK" to "en-GB" | Christopher Arrowsmith | 2011-09-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Signed-off-by: Christopher Arrowsmith <chris@agouti.co.uk> | |||||
| * | | | Merge pull request #3141 from jsl/make_ssl_configurable | José Valim | 2011-09-27 | 4 | -3/+13 | |
| |\ \ \ | | | | | | | | | Make the Rack::SSL middleware configurable | |||||
| | * | | | Make the Rack::SSL middleware configurable | Justin Leitgeb | 2011-09-26 | 4 | -3/+13 | |
| |/ / / | ||||||
| * | | | partial pass over the asset pipeline guide | Xavier Noria | 2011-09-26 | 1 | -20/+22 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |