aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* don't include debugger gem if jruby is used since it doesn't work on jruby.Teng Siong Ong2012-12-121-0/+2
* Explain how to supersede the new dynamic welcome pageGeorge Claghorn2012-12-111-0/+2
* Merge pull request #8468 from schneems/schneems/rack-index-pageSantiago Pastorino2012-12-1010-20/+52
|\
| * Use Rails to Render Default Index Pageschneems2012-12-1010-20/+52
* | Make sure that no extra spaces are created with a non-polymorphicRafael Mendonça França2012-12-102-4/+8
* | Merge branch 'scaffold_fixes'Rafael Mendonça França2012-12-1010-22/+84
|\ \
| * | Ensure the scaffold tests will pass when using references attributesRafael Mendonça França2012-12-101-0/+10
| * | Add GeneratedAttribute#column_name to get the name of the column in theRafael Mendonça França2012-12-104-8/+19
| * | Extract a attributes_names method to avoid duplicationRafael Mendonça França2012-12-104-22/+12
| * | Deal with polymorphic attributes correctly in the generatorsRafael Mendonça França2012-12-106-10/+41
| * | Make references and belongs_to attributes to generate the _id column inRafael Mendonça França2012-12-102-2/+7
| * | Put the reference and belongs_to attributes in the scaffold tests.Rafael Mendonça França2012-12-103-12/+9
| * | Use the references and belongs_id ids in the scaffold_controllerRafael Mendonça França2012-12-092-1/+10
| * | Add test case for scaffold_controller generator without attributes.Rafael Mendonça França2012-12-091-0/+9
* | | Merge pull request #8472 from schneems/schneems/expand_pathRafael Mendonça França2012-12-091-1/+1
|\ \ \ | |_|/ |/| |
| * | Use `File.expand_path` instead of `File.join`schneems2012-12-091-1/+1
* | | Revert "Omit directories from gemspec.files for RubyGems 2 compat."Jeremy Kemper2012-12-091-1/+1
| |/ |/|
* | Remove the spaces after the open bracket and before the close bracket.Rafael Mendonça França2012-12-091-1/+1
* | Make code statistics rake task handle new test locations properlyGeorge Claghorn2012-12-091-1/+7
* | Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-081-1/+1
* | Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
* | Fix scaffold controller generator testsCarlos Antonio da Silva2012-12-081-8/+6
* | Merge pull request #8461 from frodsan/fix_assert_method_generatorsCarlos Antonio da Silva2012-12-081-1/+1
|\ \
| * | Fix #assert_instance_method to also assert indented methodsFrancesco Rodriguez2012-12-081-1/+1
* | | Merge pull request #8395 from bmaland/attr_accessorsCarlos Antonio da Silva2012-12-081-23/+1
|\ \ \
| * | | Use attr_accessor for Rails.{application,cache,logger}Bjørn Arild Mæland2012-12-011-23/+1
* | | | fix scaffold controller generator testsFrancesco Rodriguez2012-12-071-16/+12
* | | | use :only instead of :except callback option in the controller templateFrancesco Rodriguez2012-12-071-3/+2
| |/ / |/| |
* | | Let the scaffold example use the "set shared record" pattern to explain callb...David Heinemeier Hansson2012-12-071-6/+7
* | | Revert "Invert precedence of content in ActionDispatch::Static"Andrew White2012-12-071-23/+0
* | | Stop shelling out more than necessaryCarlos Antonio da Silva2012-12-071-10/+10
* | | Run rake tasks all at once in rake dbs test for a speed upCarlos Antonio da Silva2012-12-061-12/+6
* | | Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-061-0/+23
* | | Refactor tests that switch RAILS_ENV and RACK_ENVCarlos Antonio da Silva2012-12-066-63/+63
| |/ |/|
* | Revert turbolinks load order requirementNick Reed2012-12-051-3/+1
* | Fix duplicated method nameCarlos Antonio da Silva2012-12-051-2/+1
* | Add ENV['RACK_ENV'] support to rake runner/console/server.kennyj2012-12-067-5/+67
* | Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-052-1/+4
|\ \
| * | Adding filter capability to ActionController logsFabrizio Regini2012-12-052-1/+4
* | | Replace comments' non-breaking spaces with spacesclaudiob2012-12-042-2/+2
|/ /
* | Track the default application.css/js files for turbolinks as per version 0.6.0David Heinemeier Hansson2012-12-041-2/+2
* | Locate `=require turbolinks` at the bottom of application.jsYasuharu Ozaki2012-12-041-1/+3
* | Fix wrong doc and message about rails profiler.kennyj2012-12-041-1/+1
* | Fix failing tests related to rake notesCarlos Antonio da Silva2012-12-031-2/+2
* | Merge pull request #8394 from acangiano/add_db_folder_to_annotationsRafael Mendonça França2012-12-013-1/+7
|\ \
| * | Add db to the list of default annotation foldersAntonio Cangiano2012-12-013-1/+7
| |/
* / Quote ~ in git config global excludes command.Matthew M. Boedicker2012-12-011-1/+1
|/
* Gemfile source url for plugins updatedAmparo Luna2012-11-291-1/+1
* Remove observers and sweepersRafael Mendonça França2012-11-2813-155/+4
* Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"Rafael Mendonça França2012-11-272-2/+2