aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* move route_inspector to actionpack@schneems and @mattt2012-07-073-5/+6
| | | | this is so we can show route output in the development when we get a routing error. Railties can use features of ActionDispatch, but ActionDispatch should not depend on Railties.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-071-2/+1
|\
| * There is only task for installing migrations when using enginesWojciech Wnętrzak2012-07-041-2/+1
| |
* | update test_help to config properly turn natural language optionFrancesco Rodriguez2012-07-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
* | Merge pull request #6959 from robin850/patch-1José Valim2012-07-051-0/+49
|\ \ | | | | | | Add few information on the field types
| * | Add few information on the field typesRobin Dupret2012-07-041-0/+49
| | |
* | | CSV fixtures aren't supported by default anymore, update generated ↵Guillermo Iguaran2012-07-041-1/+1
|/ / | | | | | | test_helper.rb to reflect that
* | remove test/dummy from gitignore when "plugin new -T"Francesco Rodriguez2012-07-031-0/+2
| |
* | Ensure test jobs are marshallablePaul Battley2012-07-031-0/+7
| | | | | | | | | | | | | | | | | | | | By marshalling and unmarshalling jobs when adding them to the test queue, we can ensure that jobs created during test runs are valid candidates for marshalling, and, thus, that they can be used with queueing backends other than the default simple in-process implementation. This will also be used in a subsequent commit to ensure that jobs pushed to the queue do not contain a reference to the queue itself.
* | Merge pull request #6910 from mulder/fix_path_globJosé Valim2012-07-011-1/+2
|\ \ | |/ |/| Persist glob when replacing a path
| * Persist glob when replacing a pathNicholas Mulder2012-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Rails::Paths::Root's []= is used to replace a path it should persist the previous path's glob. Without passing the glob along we get gnarly bugs when trying to wire up things like engines. module FooEngine class Engine < ::Rails::Engine isolate_namespace FooEngine config.paths['config/initializers'] = "lib/foo_engine/initializers" end end ## Example of behaviour before this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => nil ## Example of behaviour after this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb"
* | Revert "Allow loading external route files from the router"José Valim2012-06-294-25/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb
* | Remove unused responsibilities and add a few load definitions to enginesJosé Valim2012-06-293-146/+139
|/ | | | | | | | Since plugins were removed, we can clean up a few methods in engines. We also use this opportunity to move `load_console`, `load_tasks` and `load_runner` to Rails::Engine. This means that, if someone wants to improve script/rails for engines to support console or runner commands, part of the work is already done.
* Remove unnecessary Railties structure now that plugins are goneJosé Valim2012-06-294-110/+80
|
* Rename RouteInspect to RoutesInspector for consistencyJosé Valim2012-06-293-5/+5
|
* Merge pull request #6856 from lexmag/polymorphic_generatorsCarlos Antonio da Silva2012-06-271-2/+12
|\ | | | | | | | | | | | | | | | | Add polymorphic option to model generator For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.
| * Add polymorphic option to model generatorAleksey Magusev2012-06-271-2/+12
| | | | | | | | | | | | | | | | | | | | For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. Also fix model_generator_test.rb#L196 and #L201
* | Merge pull request #6839 from bcardarella/async-actionmailerAaron Patterson2012-06-261-0/+3
|\ \ | |/ |/| Async actionmailer
| * Add commented out ActionMailer async config optionBrian Cardarella2012-06-231-0/+3
| |
* | ruby 1.9 hash syntax for generated codeRichard Huang2012-06-235-12/+12
|/ | | | | | | | app/controllers/application_controller.rb app/views/layouts/application.html.erb config/application.rb config/routes.rb test/performance/browsing_test.rb
* add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-221-1/+1
|
* use system tmpdir rather than our ownAaron Patterson2012-06-191-2/+10
|
* Change minimum (default) log level in PostgreSQL to warning.kennyj2012-06-182-4/+4
|
* Require thor 0.15.3 onwardsJosé Valim2012-06-181-0/+1
|
* Merge pull request #6708 from ↵José Valim2012-06-111-1/+1
|\ | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted
| * ignore .gitignore'd files in rake test:uncomittedAkira Matsuda2012-06-121-1/+1
| |
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-111-1/+1
|\ \ | |/ |/| Fix: 'rake rails:templates:copy' doesn't work
| * fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
| |
* | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ | | | | | | Add Prompt to 404 & 500 Pages to Check Logs in Production
| * | add prompt to 404 & 500 pages to check logsschneems2012-06-092-0/+2
| |/ | | | | When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.
* | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-102-0/+5
|\ \ | |/ |/| Notify A User they Have Pending Migrations
| * raise error for pending migration schneems2012-06-092-0/+5
| | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
* | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-081-1/+1
|\ \ | | | | | | Plugin gen fix
| * | We should not include engine.rake file into rakeArun Agrawal2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
* | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-081-0/+2
|/ / | | | | | | (closes #6672)
* | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-071-4/+4
|\ \ | | | | | | change AMS::JSON.include_root_in_json default value to false
| * | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Update `include_root_in_json` default value to false for default value to false for `ActiveModel::Serializers::JSON`. * Remove unnecessary change to include_root_in_json option in wrap_parameters template. * Update `as_json` documentation. * Fix JSONSerialization tests. Problem: It's confusing that AM serializers behave differently from AR, even when AR objects include AM serializers module. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"person"=>{"name"=>"Francesco", "age"=>22}} # root is included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => true # different default values for include_root_in_json Proposal: Change the default value of AM serializers to false, update the misleading documentation and remove unnecessary change to false of include_root_in_json option with AR objects. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"name"=>"Francesco", "age"=>22} # root is not included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => false # same behaviour, more consistent Fixes #6578.
* | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| | |
* | | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
| | |
* | | Fixed the application_controller require_dependency path generated by the ↵Fred Wu2012-06-062-5/+6
| | | | | | | | | | | | app generator
* | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-051-0/+15
|/ /
* | remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
| |
* | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
| | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
* | Rake::DSL should always be availableJeremy Kemper2012-05-311-1/+1
| |
* | Explicitly require rake so its DSL is availableJeremy Kemper2012-05-311-0/+1
| |
* | Add code statistics for Javascript andArun Agrawal2012-05-312-2/+10
| | | | | | | | | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm
* | Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
| | | | | | | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
* | Remove support for rails server RAILS_ENV=env-nameSam Oliver2012-05-301-5/+0
| |
* | Fix various bugs with console arguments.Sam Oliver2012-05-303-86/+109
|/ | | | Allow hyphens in environment names again.
* remove unused route reloading codeschneems2012-05-301-2/+0
| | | Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953