aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5266 from bcardarella/root_with_string_optionsPiotr Sarnacki2012-03-042-0/+14
|\ | | | | Route root helper shortcut
| * Route root helper shortcutBrian Cardarella2012-03-032-0/+14
| | | | | | | | Allow the root route helper to accept just a string
* | Merge pull request #5270 from kennyj/fix_3163Piotr Sarnacki2012-03-043-1/+22
|\ \ | | | | | | Fix GH #3163. Should quote database on mysql/mysql2.
| * | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-03-053-1/+22
|/ /
* | Fix rake test_sqlite3_memJon Leighton2012-03-041-7/+9
| |
* | Remove unusused variablesJon Leighton2012-03-043-14/+9
|/
* [engines guide] Add more concrete example of conflicts when not using ↵Piotr Sarnacki2012-03-031-1/+1
| | | | isolate_namespace
* Handle files from ActionDispatch::Static with Rack::Sendfile (fixes #5225)Piotr Sarnacki2012-03-033-5/+18
| | | | | | | | This makes rails behave properly when you serve static assets and you have X-Sendfile headers enabled. Nevertheless in most cases you should not rely on that and serve static assets with a webserver like Apache or Nginx (as you already have it in place anyway if you use X-Sendfile)
* Merge pull request #5255 from carlosantoniodasilva/active-record-reviewPiotr Sarnacki2012-03-038-68/+77
|\ | | | | Refactor and cleanup in some ActiveRecord modules
| * Refactor and cleanup in some ActiveRecord modulesCarlos Antonio da Silva2012-03-038-68/+77
| | | | | | | | | | | | | | | | | | | | | | * Avoid double hash lookups in AR::Reflection when reflecting associations/aggregations * Minor cleanups: use elsif, do..end, if..else instead of unless..else * Simplify DynamicMatchers#respond_to? * Use "where" instead of scoped with conditions hash * Extract `scoped_by` method pattern regexp to constant * Extract noisy class_eval from method_missing in dynamic matchers * Extract readonly check, avoid calling column#to_s twice in persistence * Refactor predicate builder, remove some variables
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \ | | | | | | simplify namespace assignment in fields_for
| * | simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
| | |
* | | Merge pull request #5260 from castlerock/remove_ordered_hash_usagesSantiago Pastorino2012-03-035-6/+6
|\ \ \ | | | | | | | | remove usage of AS::OrderedHash from other places
| * | | remove usages of AS::OrderedHashVishnu Atrai2012-03-035-6/+6
|/ / /
* | | Merge pull request #4984 from raghunadhd/change_orderhashVijay Dev2012-03-033-3/+3
|\ \ \ | | | | | | | | Refactored code
| * | | Refactored codeRaghunadh2012-02-103-3/+3
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-036-19/+65
|\ \ \ \
| * | | | copy edits [ci skip]Vijay Dev2012-03-031-1/+1
| | | | |
| * | | | Made documentation of config.assets.precompile slightly more explicit.Guy Bolton King2012-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having read the previous version of the documentation, I was surprised when a wildcarded CSS pattern in precompile picked up a whole load of SCSS files! I've amended lines 426 onwards to document the behaviour.
| * | | | Removed max-stale from the setting the cache-headers in the response as ↵Anuj Dutta2012-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | max-stale is a cache request header.
| * | | | Add documentation for IndexDefinition.Waseem Ahmad2012-03-021-0/+3
| | | | |
| * | | | Improve header hierarchy.Joost Baaij2012-02-291-1/+3
| | | | |
| * | | | Include a comment as to why ETag header should be removed from the response.Joost Baaij2012-02-291-0/+1
| | | | |
| * | | | Changed asset_host config to more specificRahul P. Chaudhari2012-02-291-2/+2
| | | | |
| * | | | Some cleanup on the upgrading guideMike Gunderloy2012-02-281-14/+40
| | | | |
| * | | | Merge pull request #85 from whilefalse/rails_32_engine_upgradeVijay Dev2012-02-281-0/+12
| |\ \ \ \ | | | | | | | | | | | | Added guide to updating engines built in previous versions of Rails
| | * | | | Added guide to updating engines built in previous versions of RailsSteven Anderson2012-02-241-0/+12
| | | | | |
* | | | | | Merge pull request #5258 from guilleiguaran/amo-modelJon Leighton2012-03-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use public_send instead of send in ActiveModel::Model initialize
| * | | | | | Use public_send instead of send in ActiveModel::Model initializeGuillermo Iguaran2012-03-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #5256 from carlosantoniodasilva/active-model-modelJosé Valim2012-03-033-1/+81
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add docs with usage examples for ActiveModel::Model
| * | | | | Add docs with usage examples for ActiveModel::ModelCarlos Antonio da Silva2012-03-033-1/+81
|/ / / / / | | | | | | | | | | | | | | | | | | | | Also add test to ensure basic model does not explode when initialized with nil.
* | | | | Merge pull request #5253 from guilleiguaran/amo-modelJeremy Kemper2012-03-024-0/+44
|\ \ \ \ \ | | | | | | | | | | | | Add ActiveModel::Model, a mixin to make plain Ruby objects work with AP out of box
| * | | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatlyGuillermo Iguaran2012-03-024-0/+44
|/ / / / /
* | | | / Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵Santiago Pastorino2012-03-031-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | that info Closes #5245
* | | | only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
| | | |
* | | | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
| | | | | | | | | | | | | | | | | | | | It fails if routes from to railties are called in one context, for example: blog.posts_path and main_app.users_path
* | | | Merge pull request #5243 from lest/patch-2José Valim2012-03-021-2/+2
|\ \ \ \ | | | | | | | | | | don't pass unnecessary argument
| * | | | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
|/ / / /
* | | | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-48/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times.
| * | | | Optimize url helpers.Sergey Nartimov + José Valim2012-03-026-29/+36
| | | | |
| * | | | Optimize path helpers.José Valim2012-03-025-29/+81
| | | | |
* | | | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
| | | | |
* | | | | Merge pull request #5241 from carlosantoniodasilva/output-safetyJosé Valim2012-03-021-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Stop SafeBuffer#clone_empty from issuing warnings
| * | | | | Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1 This was issuing a "not initialized variable" warning - related to: https://github.com/rails/rails/pull/5237 The logic applied by this method is already handled by the [] override, so there is no need to reset the variable here.
* | | | | Merge pull request #5234 from benpickles/allow-empty-fieldsetsPiotr Sarnacki2012-03-022-2/+11
|\ \ \ \ \ | |/ / / / |/| | | | Allow empty fieldsets to be created without a block.
| * | | | Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
| | | | |
* | | | | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334.
* | | | Merge pull request #5232 from claudiob/add_release_date_to_docsVijay Dev2012-03-016-12/+12
|\ \ \ \ | | | | | | | | | | Add release dates to documentation
| * | | | Add release dates to documentationclaudiob2012-03-016-12/+12
|/ / / / | | | | | | | | | | | | Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12
* | | | Merge branch 'master-security'Aaron Patterson2012-03-015-29/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options Conflicts: actionpack/lib/action_view/helpers/tags/base.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:47:49 +0000