aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-156-61/+0
|\ | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-146-61/+0
| |
* | prevent using already loaded Gemfile for 'bundle install', fix #6314Michal Papis2012-05-151-0/+8
| |
* | Remove not used date variable and another test warningCarlos Antonio da Silva2012-05-141-2/+1
| |
* | Remove assertion on date from humans.txt testsJosé Valim2012-05-141-1/+1
| |
* | 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
* | Merge pull request #6307 from oscardelben/refactor_app_generator_testCarlos Antonio da Silva2012-05-131-22/+20
|\ \ | | | | | | Refactor App Generator Test
| * | Refactor App Generator TestOscar Del Ben2012-05-131-22/+20
| | |
* | | 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
|/ /
* / Remove useless load path modificationsSantiago Pastorino2012-05-112-4/+4
|/
* 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.
* Failing test for #6251Piotr Sarnacki2012-05-101-0/+7
|
* registers ceb1dcc in the CHANGELOGXavier Noria2012-05-091-0/+2
|
* Adding test for humans.txtArun Agrawal2012-05-081-0/+6
|
* add humans.txtPaul Campbell2012-05-081-0/+9
|
* Fix buildPiotr Sarnacki2012-05-061-7/+10
|
* Ensure that Rails.env is equal to "test" by default when running tests.Piotr Sarnacki2012-05-061-0/+2
| | | | | Rails.env when running tests on localhost differs from travis ci which makes it harder to write tests that check env related things.
* Merge pull request #5910 from route/rails-dbconsoleJeremy Kemper2012-05-063-40/+86
|\ | | | | Fast path starts the database console without loading the full Rails env
| * More faster rails dbconsoleDmitry Vorotilin2012-05-063-40/+86
| |
* | 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-042-2/+6
|
* Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-042-1/+24
|
* Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-044-9/+44
| | | | | | 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-032-1/+37
|\ | | | | Provided fix for calling rake tasks within mountable engines
| * Provided fix for calling rake tasks within mountable enginesPatrick Helm2012-04-122-1/+37
| |
* | Merge pull request #6012 from avakhov/dbconsole-testPiotr Sarnacki2012-05-032-22/+162
|\ \ | | | | | | Cover Rails::DBConsole with tests
| * | Add Rails::DBConsole testsAlexey Vakhov2012-05-022-22/+162
| | |
* | | Merge pull request #6119 from romanvbabenko/refactor/checking_rubygems_presenceJeremy Kemper2012-05-022-19/+15
|\ \ \ | | | | | | | | Gem const presence checking has been removed
| * | | Gem cont presence checking has been removedRoman V. Babenko2012-05-022-19/+15
| | | |
* | | | Merge pull request #6116 from romanvbabenko/refactor/executable_rakefilesJeremy Kemper2012-05-023-3/+0
|\ \ \ \ | | | | | | | | | | Rakefile executable attributes and shebang lines has been removed
| * | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-023-3/+0
| |/ / /
* | | | Fix build for railties generators Arun Agrawal2012-05-022-3/+3
| | | |
* | | | build fix for SharedGeneratorTestsArun Agrawal2012-05-021-2/+2
|/ / /
* / / Use new hash syntax in generated GemfileOscar Del Ben2012-05-021-14/+14
|/ /
* | Build fix for plugin new generator changeCarlos Antonio da Silva2012-05-011-2/+2
| | | | | | | | Related to a06a84bf77082a7435973fa1b6c8254fb410f243
* | 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.