aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not change a frozen text passed to simple_format text helperTadas Tamosauskas2011-06-202-2/+10
|
* Merge pull request #1780 from dazuma/fix_missing_require_setJosé Valim2011-06-201-0/+2
|\ | | | | Add missing require 'set'
| * Add missing require 'set'Daniel Azuma2011-06-201-0/+2
|/
* Merge pull request #1776 from jamesarosen/clean_imagesJoshua Peek2011-06-191-1/+1
|\ | | | | assets:clean task now cleans up images
| * assets:clean task now cleans up imagesJames A. Rosen2011-06-191-1/+1
| |
* | Call super here to allow SessionHash initialize new stuff for usSantiago Pastorino2011-06-191-1/+1
|/
* Merge pull request #1770 from arunagw/require_relative_removeJosé Valim2011-06-191-3/+0
|\ | | | | Removing require_relative gem. Linecache new version 0.46 is out and it's
| * Removing require_relative gem. Linecache new version 0.46 is out and it's ↵Arun Agrawal2011-06-191-3/+0
| | | | | | | | loading rbx-require-relative > 0.0.4
* | explains why links are gsub'ed, and changes the regexp delimitersXavier Noria2011-06-191-1/+4
|/
* Ugh, the class_attribute pull request broke the build. fix it.José Valim2011-06-191-7/+4
|
* Merge pull request #1763 from grantneufeld/schema_column_exists_options_hashJosé Valim2011-06-182-1/+13
|\ | | | | Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
| * Changed the default value for the options argument on ↵Grant Neufeld2011-06-182-1/+13
| | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}. That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash. When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.
* | Merge pull request #1764 from stevehodgkiss/masterJosé Valim2011-06-184-0/+34
|\ \ | | | | | | Fix inconsistencies with serving images in production mode when ActiveRecord is loaded
| * | Fix inconsistencies by being polite to the wrapped body. Needed for ↵Steve Hodgkiss2011-06-184-0/+34
| |/ | | | | | | Rack::Sendfile to function properly. See issue #1761.
* | Merge pull request #1765 from bensie/class_attribute_skip_readerJosé Valim2011-06-182-7/+26
|\ \ | | | | | | Add option to omit creating an instance reader method on class_attribute
| * | Add option to omit creating an instance reader method on class_attributeJames Miller2011-06-182-7/+26
| |/
* | Merge pull request #1762 from vijaydev/readme_links_rdocXavier Noria2011-06-182-2/+3
|\ \ | |/ |/| Solving the problem of links being broken in GitHub for the sake of api site
| * To solve the problem of links being broken in GitHub for the sake of api ↵Vijay Dev2011-06-182-2/+3
|/ | | | site, have them replaced at runtime during rdoc generation
* Revert changes done in c56618ec, 51cb7459 and 030950a. The links areVijay Dev2011-06-181-2/+2
| | | | | pointing to files/*/*.html for usage in api.rubyonrails.org and as a result are broken in GitHub blobs. This is unavoidable (at least for now).
* Flesh out the asset pipeline guide with information learned from today's ↵Ryan Bigg2011-06-181-20/+72
| | | | research
* copy-edits 7c2db6c, cbf2af1, and f391f94Xavier Noria2011-06-182-3/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-1822-88/+228
|\
| * Added 'Configuring Assets' section to configuring guideRyan Bigg2011-06-181-0/+15
| |
| * Change ActiveRecord and ActionPack links to point to the right place Jason Noble2011-06-171-2/+2
| |
| * Change ActiveRecord and ActionPack links to point to the right place Jason Noble2011-06-171-2/+2
| |
| * Change ActiveRecord and ActionPack links to point to the right placeJason Noble2011-06-171-2/+2
| |
| * Update remove_index documentationLucia Escanellas2011-06-173-11/+13
| | | | | | | | | | * Changes should better reflect present code behavior * Related to issue: https://github.com/rails/rails/issues/1624
| * Typo.R.T. Lechow2011-06-161-2/+2
| |
| * minor clean up generators sectionVijay Dev2011-06-161-4/+5
| |
| * add info that plugin installs need git or svn installedVijay Dev2011-06-161-1/+1
| |
| * document doc:* rake tasksVijay Dev2011-06-161-1/+7
| |
| * typo changes fixedJudeAr2011-06-151-1/+1
| |
| * fixed typo chnagesJudeAr2011-06-151-1/+1
| |
| * add details on how to use specific annotations in rake:notesVijay Dev2011-06-151-2/+16
| |
| * document how rake notes workVijay Dev2011-06-151-1/+22
| |
| * Merge pull request #47 from jasonfox/masterJason Fox2011-06-151-4/+4
| |\ | | | | | | Fixed two errors in the doc
| | * The name for the plain text template in Rails3 appears to be ↵Jason Fox2011-06-151-4/+4
| |/ | | | | | | method.text.erb, not, method.text.plain.erb. Updated the doc to reflect this change. Also fixed a reference to an example that was incorrect.
| * form => form_forVijay Dev2011-06-151-1/+1
| |
| * Tweak linebreak in ActionController::Redirecting docChristine Yen2011-06-151-2/+2
| |
| * Clarify importance of *_attributes= writer methods for nested fieldsChristine Yen2011-06-151-8/+12
| |
| * Updated rails´s guides on the config.serve_static_assets and it´s settings ↵thoefer2011-06-151-1/+1
| | | | | | | | in production mode using WEBrick. This documentation has it´s roots in #issue1657. You have to set config.serve_static_assets to true in production mode with WEBrick as only this includes ActionDispatch::Static.
| * Merge pull request #45 from christineyen/redirect_to_docsVijay Dev2011-06-151-1/+2
| |\ | | | | | | Documentation tweak - add a helpful reminder to redirect_to
| | * Improve documentation around status code argument of redirect_toChristine Yen2011-06-151-1/+2
| |/
| * minor copy edit 0bdeddbVijay Dev2011-06-151-2/+2
| |
| * Jruby => JRuby, Mysql => MySQLArun Agrawal2011-06-151-6/+6
| |
| * Moving hint down. As required after all database examples. Arun Agrawal2011-06-151-2/+2
| |
| * Using "Finally" at the end of database section. Arun Agrawal2011-06-151-2/+2
| |
| * Added Doc for Postgresql database with Jruby Platform. #jrubyArun Agrawal2011-06-151-0/+13
| |
| * Added doc for Mysql database with Jruby platform #jrubyArun Agrawal2011-06-151-0/+12
| |
| * Adding doc for Sqlite3 database for Jruby platform #jrubyArun Agrawal2011-06-151-0/+10
| |