aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Removed rescue branch for Rails 2.x compatibilityAlexey Gaziev2011-06-201-3/+0
| * | | | | | Fix regexp in generators for right catching error messageAlexey Gaziev2011-06-201-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1787 from cmeiklejohn/make_fragment_for_more_robust_for_s...José Valim2011-06-201-6/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only mark the sliced buffer as safe, if it was safe to begin with.Christopher Meiklejohn2011-06-201-1/+2
| * | | | | Streamline fragment_for SafeBuffer logic to make it more concise.Christopher Meiklejohn2011-06-201-6/+3
|/ / / / /
* | | | | Merge pull request #1785 from medwezys/masterJosé Valim2011-06-202-2/+10
|\ \ \ \ \
| * | | | | Do not change a frozen text passed to simple_format text helperTadas Tamosauskas2011-06-202-2/+10
* | | | | | Merge pull request #1784 from gazay/3-1-stable-shadowing-variablesJosé Valim2011-06-203-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed shadowing variable warning in activerecord railtiesAlexey Gaziev2011-06-201-1/+1
| * | | | | Removed warnings about shadowing variablesAlexey Gaziev2011-06-202-7/+7
* | | | | | Merge pull request #1780 from dazuma/fix_missing_require_setJosé Valim2011-06-201-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 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 loa...Arun Agrawal2011-06-191-3/+0
* | | | | 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
|\ \ \ \
| * | | | Changed the default value for the options argument on ActiveRecord::Connectio...Grant Neufeld2011-06-182-1/+13
* | | | | Merge pull request #1764 from stevehodgkiss/masterJosé Valim2011-06-184-0/+34
|\ \ \ \ \
| * | | | | Fix inconsistencies by being polite to the wrapped body. Needed for Rack::Sen...Steve Hodgkiss2011-06-184-0/+34
| |/ / / /
* | | | | 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_attributeJames Miller2011-06-182-7/+26
| |/ / /
* | | | Merge pull request #1762 from vijaydev/readme_links_rdocXavier Noria2011-06-182-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | To solve the problem of links being broken in GitHub for the sake of api site...Vijay Dev2011-06-182-2/+3
|/ / /
* | | Revert changes done in c56618ec, 51cb7459 and 030950a. The links areVijay Dev2011-06-181-2/+2
* | | Flesh out the asset pipeline guide with information learned from today's rese...Ryan Bigg2011-06-181-20/+72
* | | 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
| * | | 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
| |\ \ \
| | * | | The name for the plain text template in Rails3 appears to be method.text.erb,...Jason Fox2011-06-151-4/+4
| |/ / /
| * | | 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