aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #6337 from bcardarella/patch-1Aaron Patterson2012-05-161-1/+1
|\ \ | | | | | | Changing the indentation level of the block comment close for Sass
| * | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
| | | | | | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | | improve #6318Michal Papis2012-05-151-4/+5
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-155-58/+0
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-145-58/+0
| | |
* | | prevent using already loaded Gemfile for 'bundle install', fix #6314Michal Papis2012-05-151-0/+8
| | |
* | | Remove dates and environment variables from humans.txtJosé Valim2012-05-141-2/+0
| | |
* | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵José Valim2012-05-141-3/+0
| | | | | | | | | | | | AS, closes #6287
* | | Remove remaining require 'rubygems'Santiago Pastorino2012-05-131-1/+1
| | |
* | | require "rubygems" is obsolete in Ruby 1.9.3Kornelius Kalnbach2012-05-135-7/+0
| | |
* | | Remove tailing spaces :scissors: [ci skip]Rafael Mendonça França2012-05-121-1/+1
| | |
* | | Move AS set configs to AS RaitieSantiago Pastorino2012-05-121-11/+1
| | |
* | | Merge pull request #6271 from homakov/patch-5Santiago Pastorino2012-05-121-1/+11
|\ \ \ | |/ / |/| | configuration for active_support and JSON Encoding
| * | Update railties/lib/rails/application/bootstrap.rbEgor Homakov2012-05-111-1/+11
| | |
* | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
| | |
* | | Merge pull request #6277 from homakov/patch-6José Valim2012-05-121-0/+3
|\ \ \ | | | | | | | | Comment for active_support's option in application.rb
| * | | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-121-0/+3
| |/ /
* / / Add commas missing in performance testsGeoffrey Roguelon2012-05-121-1/+1
|/ /
* | In robots.txt, User-agent should be all downcase except for the first 'U', ↵Enrico Carlesso2012-05-111-1/+1
| | | | | | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard
* | Fixes issue #6251David Padilla2012-05-101-1/+1
| | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* | add humans.txtPaul Campbell2012-05-081-0/+9
| |
* | Merge pull request #5910 from route/rails-dbconsoleJeremy Kemper2012-05-062-12/+29
|\ \ | | | | | | Fast path starts the database console without loading the full Rails env
| * | More faster rails dbconsoleDmitry Vorotilin2012-05-062-12/+29
| | |
* | | Remove obsolete deep_dup requiresPiotr Sarnacki2012-05-061-2/+0
| | |
* | | Nice logic for deep_dup in railsAlexey Gaziev2012-05-061-0/+2
|/ /
* | Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
| | | | | | | | closes #4894
* | Add some docs and changelog entryCarlos Antonio da Silva2012-05-041-2/+2
| |
* | Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-041-1/+5
| |
* | Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-043-6/+8
| | | | | | | | | | | | Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer.
* | Merge pull request #5821 from Deradon/fix-engine-tasksPiotr Sarnacki2012-05-031-1/+6
|\ \ | | | | | | Provided fix for calling rake tasks within mountable engines
| * | Provided fix for calling rake tasks within mountable enginesPatrick Helm2012-04-121-1/+6
| | |
* | | Merge pull request #6012 from avakhov/dbconsole-testPiotr Sarnacki2012-05-031-22/+34
|\ \ \ | | | | | | | | Cover Rails::DBConsole with tests
| * | | Add Rails::DBConsole testsAlexey Vakhov2012-05-021-22/+34
| | | |
* | | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presenceJeremy Kemper2012-05-021-2/+0
|\ \ \ \ | | | | | | | | | | Gem const presence checking has been removed
| * | | | Gem cont presence checking has been removedRoman V. Babenko2012-05-021-2/+0
| | | | |
* | | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-022-2/+0
|/ / / /
* / / / Use new hash syntax in generated GemfileOscar Del Ben2012-05-021-14/+14
|/ / /
* | | Merge pull request #4345 from sunaku/patch-1Santiago Pastorino2012-05-011-1/+1
|\ \ \ | | | | | | | | gemspec assumes that user kept all generated files
| * | | gemspec assumes that user kept all generated files Suraj N. Kurapati2012-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | This commit allows the user be lazy and not update their gemspec's `files` directive after deleting unwanted files from their generated Rails plugin.
* | | | Use :github option in Gemfile and make hashes consistentPiotr Sarnacki2012-05-011-8/+8
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-013-3/+3
|\ \ \ \
| * | | | Revert "Added Short 1 line note about connection pools. "Vijay Dev2012-05-011-2/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit c3954baee92446219606621c1b185360553a6d5d.
| * | | | Added Short 1 line note about connection pools. Gaurish Sharma2012-04-301-0/+2
| | | | | | | | | | | | | | | I hope its okay to add this here. if not, then please revert back.
| * | | | Code-format references to config settingsMark Rushakoff2012-04-273-3/+3
| | | | |
* | | | | Fixed styling issues brought up by @jeremyJason Noble2012-04-301-1/+1
| | | | |
* | | | | Add ability to specify custom annotation directoriesJason Noble & Ralph Shnelvar2012-04-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes Searches app, config, lib, script, test (default) Also searches dir1, dir2 References: #4536, #4540
* | | | | Merge pull request #5530 from ↵José Valim2012-04-302-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | malclocke/add_option_to_skip_index.html_on_rails_generate Added a generator option to skip the public/index.html file
| * | | | | Added a generator option to remove the public/index.html file when ↵Ivan Vanderbyl2012-03-212-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating a new Rails application The option is: -i, [--skip-index-html] # Skip public/index.html file
* | | | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove some unused variable assignments
| * | | | | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
| | | | | | |