aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1404 from ↵José Valim2011-05-303-1/+27
|\ | | | | | | | | commuter/plugin_new_generator_should_properly_require_js properly require javascript libraries when generating mountable engine
| * properly require javascript libraries when generating mountable engineJ. Edward Dewyea2011-05-303-1/+27
| |
* | refectored assets:clean taskVishnu Atrai2011-05-301-3/+1
| |
* | rename task and Rake::FileList used Vishnu Atrai2011-05-271-3/+3
| |
* | Add rake task to implement assets:cleanup, fixes Github Issues # 1284Bhavin Kamani2011-05-271-0/+10
|/
* Use global namespace RailsStefan Sprenger2011-05-262-2/+2
|
* Use plugin name consistentlyStefan Sprenger2011-05-261-1/+1
|
* Merge pull request #1315 from ardavis/masterJosé Valim2011-05-252-2/+2
|\ | | | | Removed unnecessary space in application.rb
| * Added a space to the comment_if helper for formatting purposesAndrew Davis2011-05-251-1/+1
| |
| * Removed unnecessary space in application.rb for formattingAndrew Davis2011-05-251-1/+1
| |
* | Updating Railties changelogGuillermo Iguaran2011-05-251-0/+7
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2516-154/+167
|\ | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * Typo; changed 'Febuary' to 'February'Lee Reilly2011-05-251-1/+1
| |
| * Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'Lee Reilly2011-05-251-3/+3
| |
| * Typo; changed 'enviroment' to 'environment'Lee Reilly2011-05-251-1/+1
| |
| * prefer validates :x in place of validates_x_ofVijay Dev2011-05-261-25/+25
| |
| * fixed minor errorsVijay Dev2011-05-261-3/+4
| |
| * changes validates_format & numericality to newer syntaxVijay Dev2011-05-251-6/+6
| |
| * changes validates_inclusion & exclusion to newer syntaxVijay Dev2011-05-251-7/+7
| |
| * changes validates_length_of to newer syntaxVijay Dev2011-05-251-17/+14
| |
| * changes validates_confirmation_of to newer syntaxVijay Dev2011-05-251-4/+4
| |
| * changes validates_acceptance_of to newer syntaxVijay Dev2011-05-251-2/+2
| |
| * changes validates_uniqueness_of to newer syntaxVijay Dev2011-05-251-4/+4
| |
| * changes validates_presence_of to newer syntaxVijay Dev2011-05-251-9/+8
| |
| * fix incorrect textile syntaxVijay Dev2011-05-251-2/+2
| |
| * update language env variable nameVijay Dev2011-05-251-2/+2
| |
| * Adds outline draft#1 for the Asset Pipeline, please comment if you have ↵Mohammad El-Abid2011-05-251-0/+29
| | | | | | | | thoughts about it!
| * Removed extra white-spaces on config/environment/test.rb templateGuillermo Iguaran2011-05-231-2/+2
| |
| * Removing extra white-spaces on config/environment/development.rb templateGuillermo Iguaran2011-05-231-1/+1
| |
| * Fix styling error on plugins guide.Sebastian Martinez2011-05-231-1/+1
| |
| * NOTE: doesn't handle newlines.Matthew McEachen2011-05-231-3/+1
| |
| * removed require_library_or_gem from the AS core extensions guideJosh Kalderimis2011-05-231-14/+0
| |
| * Minor typo describing engine helpersMatthew Daubert2011-05-221-2/+2
| |
| * Following proper naming conventions while referring to Rails, BundlerMatthew McEachen2011-05-221-4/+4
| |
| * Removed the `enginex` plugin reference which is broken -- rails 3.1.0.beta1 ↵Matthew McEachen2011-05-211-16/+19
| | | | | | | | has that functionality now.
| * Remove extra white spaces on guides.Sebastian Martinez2011-05-214-26/+26
| |
| * Remove extra white spaces.Sebastian Martinez2011-05-211-2/+2
| |
| * Remove duplicate words.Uģis Ozols2011-05-201-1/+1
| |
| * Changin 'for' with 'each' on FormHelpers guideGuillermo Iguaran2011-05-191-1/+1
| |
| * Using each instead of for in actionview guideGuillermo Iguaran2011-05-191-1/+1
| |
| * Replacing 'for' with 'each' in actionmailer guide Guillermo Iguaran2011-05-191-1/+1
| |
* | Merge pull request #1305 from amatsuda/require_rdoc_task_fail2José Valim2011-05-254-11/+6
|\ \ | | | | | | Ensure RDoc::Task exists even if 'rdoc/task' was not required
| * | Ensure RDoc::Task exists even if 'rdoc/task' was not requiredAkira Matsuda2011-05-264-11/+6
| | |
* | | Merge pull request #1308 from vijaydev/fix-codestat-indentJosé Valim2011-05-251-1/+1
|\ \ \ | | | | | | | | Minor indentation fix in code_statistics
| * | | fix indentationVijay Dev2011-05-251-1/+1
| |/ /
* / / Renaming helper in the Rake task, but why is this needed in the first place? ↵wycats2011-05-251-1/+1
|/ / | | | | | | (paging JP)
* | Merge pull request #1301 from amatsuda/require_rdoc_task_failXavier Noria2011-05-254-5/+21
|\ \ | | | | | | require 'rake/rdoctask' if failed to require 'rdoc/task'
| * | require 'rake/rdoctask' if failed to require 'rdoc/task'Akira Matsuda2011-05-264-5/+21
| | | | | | | | | | | | | | | fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5 require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
* | | Improve test assertionStefan Sprenger2011-05-251-1/+3
| | |
* | | Remove whitespaces from empty lineStefan Sprenger2011-05-251-1/+1
| | |