« back to all changes in this revision
Viewing changes to vendor/rails/actionpack/test/fixtures/layouts/talk_from_action.erb
- Committer: Richard Lee (Canonical)
- Date: 2010-10-15 15:17:58 UTC
- mfrom: (190.1.3 use-case-mapper)
- Revision ID: richard.lee@canonical.com-20101015151758-wcvmfxrexsongf9d
Merge
- files added:
- config/environments/staging.rb
- files removed:
- junction.tmproj
- vendor/rails
- vendor/rails/actionmailer
- vendor/rails/actionmailer/lib
- vendor/rails/actionmailer/lib/action_mailer
- vendor/rails/actionmailer/lib/action_mailer/vendor
- vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3
- vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text
- vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3
- vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail
- vendor/rails/actionmailer/test
- vendor/rails/actionmailer/test/fixtures
- vendor/rails/actionmailer/test/fixtures/asset_host_mailer
- vendor/rails/actionmailer/test/fixtures/auto_layout_mailer
- vendor/rails/actionmailer/test/fixtures/explicit_layout_mailer
- vendor/rails/actionmailer/test/fixtures/first_mailer
- vendor/rails/actionmailer/test/fixtures/helper_mailer
- vendor/rails/actionmailer/test/fixtures/helpers
- vendor/rails/actionmailer/test/fixtures/layouts
- vendor/rails/actionmailer/test/fixtures/path.with.dots
- vendor/rails/actionmailer/test/fixtures/path.with.dots/funky_path_mailer
- vendor/rails/actionmailer/test/fixtures/second_mailer
- vendor/rails/actionmailer/test/fixtures/templates
- vendor/rails/actionmailer/test/fixtures/test_mailer
- vendor/rails/actionpack
- vendor/rails/actionpack/lib
- vendor/rails/actionpack/lib/action_controller
- vendor/rails/actionpack/lib/action_controller/assertions
- vendor/rails/actionpack/lib/action_controller/caching
- vendor/rails/actionpack/lib/action_controller/cgi_ext
- vendor/rails/actionpack/lib/action_controller/routing
- vendor/rails/actionpack/lib/action_controller/session
- vendor/rails/actionpack/lib/action_controller/templates
- vendor/rails/actionpack/lib/action_controller/templates/rescues
- vendor/rails/actionpack/lib/action_controller/vendor
- vendor/rails/actionpack/lib/action_controller/vendor/html-scanner
- vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html
- vendor/rails/actionpack/lib/action_pack
- vendor/rails/actionpack/lib/action_view
- vendor/rails/actionpack/lib/action_view/erb
- vendor/rails/actionpack/lib/action_view/helpers
- vendor/rails/actionpack/lib/action_view/locale
- vendor/rails/actionpack/lib/action_view/template_handlers
- vendor/rails/actionpack/test
- vendor/rails/actionpack/test/activerecord
- vendor/rails/actionpack/test/controller
- vendor/rails/actionpack/test/controller/controller_fixtures
- vendor/rails/actionpack/test/controller/controller_fixtures/app
- vendor/rails/actionpack/test/controller/controller_fixtures/app/controllers
- vendor/rails/actionpack/test/controller/controller_fixtures/app/controllers/admin
- vendor/rails/actionpack/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb
- vendor/rails/actionpack/test/controller/controller_fixtures/vendor
- vendor/rails/actionpack/test/controller/controller_fixtures/vendor/plugins
- vendor/rails/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin
- vendor/rails/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib
- vendor/rails/actionpack/test/controller/deprecation
- vendor/rails/actionpack/test/controller/html-scanner
- vendor/rails/actionpack/test/controller/request
- vendor/rails/actionpack/test/controller/session
- vendor/rails/actionpack/test/fixtures
- vendor/rails/actionpack/test/fixtures/addresses
- vendor/rails/actionpack/test/fixtures/alternate_helpers
- vendor/rails/actionpack/test/fixtures/bad_customers
- vendor/rails/actionpack/test/fixtures/content_type
- vendor/rails/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml
- vendor/rails/actionpack/test/fixtures/customers
- vendor/rails/actionpack/test/fixtures/db_definitions
- vendor/rails/actionpack/test/fixtures/developers
- vendor/rails/actionpack/test/fixtures/failsafe
- vendor/rails/actionpack/test/fixtures/fun
- vendor/rails/actionpack/test/fixtures/fun/games
- vendor/rails/actionpack/test/fixtures/fun/serious
- vendor/rails/actionpack/test/fixtures/fun/serious/games
- vendor/rails/actionpack/test/fixtures/functional_caching
- vendor/rails/actionpack/test/fixtures/good_customers
- vendor/rails/actionpack/test/fixtures/helpers
- vendor/rails/actionpack/test/fixtures/helpers/fun
- vendor/rails/actionpack/test/fixtures/layout_tests
- vendor/rails/actionpack/test/fixtures/layout_tests/alt
- vendor/rails/actionpack/test/fixtures/layout_tests/alt/layouts
- vendor/rails/actionpack/test/fixtures/layout_tests/layouts
- vendor/rails/actionpack/test/fixtures/layout_tests/layouts/controller_name_space
- vendor/rails/actionpack/test/fixtures/layout_tests/views
- vendor/rails/actionpack/test/fixtures/layouts
- vendor/rails/actionpack/test/fixtures/mascots
- vendor/rails/actionpack/test/fixtures/multipart
- vendor/rails/actionpack/test/fixtures/override
- vendor/rails/actionpack/test/fixtures/override/test
- vendor/rails/actionpack/test/fixtures/override2
- vendor/rails/actionpack/test/fixtures/override2/layouts
- vendor/rails/actionpack/test/fixtures/override2/layouts/test
- vendor/rails/actionpack/test/fixtures/post_test
- vendor/rails/actionpack/test/fixtures/post_test/layouts
- vendor/rails/actionpack/test/fixtures/post_test/post
- vendor/rails/actionpack/test/fixtures/post_test/super_post
- vendor/rails/actionpack/test/fixtures/projects
- vendor/rails/actionpack/test/fixtures/public
- vendor/rails/actionpack/test/fixtures/public/absolute
- vendor/rails/actionpack/test/fixtures/public/images
- vendor/rails/actionpack/test/fixtures/public/javascripts
- vendor/rails/actionpack/test/fixtures/public/javascripts/subdir
- vendor/rails/actionpack/test/fixtures/public/stylesheets
- vendor/rails/actionpack/test/fixtures/public/stylesheets/subdir
- vendor/rails/actionpack/test/fixtures/quiz
- vendor/rails/actionpack/test/fixtures/quiz/questions
- vendor/rails/actionpack/test/fixtures/replies
- vendor/rails/actionpack/test/fixtures/respond_to
- vendor/rails/actionpack/test/fixtures/respond_to/layouts
- vendor/rails/actionpack/test/fixtures/scope
- vendor/rails/actionpack/test/fixtures/scope/test
- vendor/rails/actionpack/test/fixtures/symlink_parent
- vendor/rails/actionpack/test/fixtures/test
- vendor/rails/actionpack/test/fixtures/test/dot.directory
- vendor/rails/actionpack/test/fixtures/test/malformed
- vendor/rails/actionpack/test/fixtures/topics
- vendor/rails/actionpack/test/template
- vendor/rails/actionpack/test/view
- vendor/rails/activerecord
- vendor/rails/activerecord/examples
- vendor/rails/activerecord/lib
- vendor/rails/activerecord/lib/active_record
- vendor/rails/activerecord/lib/active_record/associations
- vendor/rails/activerecord/lib/active_record/connection_adapters
- vendor/rails/activerecord/lib/active_record/connection_adapters/abstract
- vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
- vendor/rails/activerecord/lib/active_record/locale
- vendor/rails/activerecord/lib/active_record/locking
- vendor/rails/activerecord/lib/active_record/serializers
- vendor/rails/activerecord/test
- vendor/rails/activerecord/test/assets
- vendor/rails/activerecord/test/cases
- vendor/rails/activerecord/test/cases/associations
- vendor/rails/activerecord/test/connections
- vendor/rails/activerecord/test/connections/jdbc_jdbcderby
- vendor/rails/activerecord/test/connections/jdbc_jdbch2
- vendor/rails/activerecord/test/connections/jdbc_jdbchsqldb
- vendor/rails/activerecord/test/connections/jdbc_jdbcmysql
- vendor/rails/activerecord/test/connections/jdbc_jdbcpostgresql
- vendor/rails/activerecord/test/connections/jdbc_jdbcsqlite3
- vendor/rails/activerecord/test/connections/native_db2
- vendor/rails/activerecord/test/connections/native_firebird
- vendor/rails/activerecord/test/connections/native_frontbase
- vendor/rails/activerecord/test/connections/native_mysql
- vendor/rails/activerecord/test/connections/native_openbase
- vendor/rails/activerecord/test/connections/native_oracle
- vendor/rails/activerecord/test/connections/native_postgresql
- vendor/rails/activerecord/test/connections/native_sqlite
- vendor/rails/activerecord/test/connections/native_sqlite3
- vendor/rails/activerecord/test/connections/native_sybase
- vendor/rails/activerecord/test/fixtures
- vendor/rails/activerecord/test/fixtures/all
- vendor/rails/activerecord/test/fixtures/categories
- vendor/rails/activerecord/test/fixtures/categories/subsubdir
- vendor/rails/activerecord/test/fixtures/naked
- vendor/rails/activerecord/test/fixtures/naked/csv
- vendor/rails/activerecord/test/fixtures/naked/yml
- vendor/rails/activerecord/test/fixtures/reserved_words
- vendor/rails/activerecord/test/migrations
- vendor/rails/activerecord/test/migrations/broken
- vendor/rails/activerecord/test/migrations/decimal
- vendor/rails/activerecord/test/migrations/duplicate
- vendor/rails/activerecord/test/migrations/duplicate_names
- vendor/rails/activerecord/test/migrations/interleaved
- vendor/rails/activerecord/test/migrations/interleaved/pass_1
- vendor/rails/activerecord/test/migrations/interleaved/pass_2
- vendor/rails/activerecord/test/migrations/interleaved/pass_3
- vendor/rails/activerecord/test/migrations/missing
- vendor/rails/activerecord/test/migrations/valid
- vendor/rails/activerecord/test/models
- vendor/rails/activerecord/test/schema
- vendor/rails/activeresource
- vendor/rails/activeresource/lib
- vendor/rails/activeresource/lib/active_resource
- vendor/rails/activeresource/lib/active_resource/formats
- vendor/rails/activeresource/test
- vendor/rails/activeresource/test/base
- vendor/rails/activeresource/test/fixtures
- vendor/rails/activesupport
- vendor/rails/activesupport/lib
- vendor/rails/activesupport/lib/active_support
- vendor/rails/activesupport/lib/active_support/cache
- vendor/rails/activesupport/lib/active_support/cache/strategy
- vendor/rails/activesupport/lib/active_support/core_ext
- vendor/rails/activesupport/lib/active_support/core_ext/array
- vendor/rails/activesupport/lib/active_support/core_ext/base64
- vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal
- vendor/rails/activesupport/lib/active_support/core_ext/cgi
- vendor/rails/activesupport/lib/active_support/core_ext/class
- vendor/rails/activesupport/lib/active_support/core_ext/date
- vendor/rails/activesupport/lib/active_support/core_ext/date_time
- vendor/rails/activesupport/lib/active_support/core_ext/file
- vendor/rails/activesupport/lib/active_support/core_ext/float
- vendor/rails/activesupport/lib/active_support/core_ext/hash
- vendor/rails/activesupport/lib/active_support/core_ext/integer
- vendor/rails/activesupport/lib/active_support/core_ext/kernel
- vendor/rails/activesupport/lib/active_support/core_ext/module
- vendor/rails/activesupport/lib/active_support/core_ext/numeric
- vendor/rails/activesupport/lib/active_support/core_ext/object
- vendor/rails/activesupport/lib/active_support/core_ext/pathname
- vendor/rails/activesupport/lib/active_support/core_ext/process
- vendor/rails/activesupport/lib/active_support/core_ext/range
- vendor/rails/activesupport/lib/active_support/core_ext/string
- vendor/rails/activesupport/lib/active_support/core_ext/time
- vendor/rails/activesupport/lib/active_support/json
- vendor/rails/activesupport/lib/active_support/json/backends
- vendor/rails/activesupport/lib/active_support/json/encoders
- vendor/rails/activesupport/lib/active_support/locale
- vendor/rails/activesupport/lib/active_support/multibyte
- vendor/rails/activesupport/lib/active_support/testing
- vendor/rails/activesupport/lib/active_support/values
- vendor/rails/activesupport/lib/active_support/vendor
- vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2
- vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test
- vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale
- vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.7.4
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuwait.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Muscat.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Riyadh.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Taipei.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tehran.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Urumqi.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Kiev.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Riga.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Rome.rb
- vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific
- vendor/rails/activesupport/lib/active_support/xml_mini
- vendor/rails/railties
- vendor/rails/railties/bin
- vendor/rails/railties/bin/performance
- vendor/rails/railties/builtin
- vendor/rails/railties/builtin/rails_info
- vendor/rails/railties/builtin/rails_info/rails
- vendor/rails/railties/configs
- vendor/rails/railties/configs/databases
- vendor/rails/railties/configs/initializers
- vendor/rails/railties/configs/locales
- vendor/rails/railties/dispatches
- vendor/rails/railties/doc
- vendor/rails/railties/environments
- vendor/rails/railties/guides
- vendor/rails/railties/guides/files
- vendor/rails/railties/guides/files/javascripts
- vendor/rails/railties/guides/files/stylesheets
- vendor/rails/railties/guides/images
- vendor/rails/railties/guides/images/i18n
- vendor/rails/railties/guides/images/icons
- vendor/rails/railties/guides/images/icons/callouts
- vendor/rails/railties/guides/rails_guides
- vendor/rails/railties/guides/source
- vendor/rails/railties/helpers
- vendor/rails/railties/html
- vendor/rails/railties/html/images
- vendor/rails/railties/html/javascripts
- vendor/rails/railties/lib
- vendor/rails/railties/lib/commands
- vendor/rails/railties/lib/commands/ncgi
- vendor/rails/railties/lib/commands/performance
- vendor/rails/railties/lib/rails
- vendor/rails/railties/lib/rails/plugin
- vendor/rails/railties/lib/rails/rack
- vendor/rails/railties/lib/rails_generator
- vendor/rails/railties/lib/rails_generator/generators
- vendor/rails/railties/lib/rails_generator/generators/applications
- vendor/rails/railties/lib/rails_generator/generators/applications/app
- vendor/rails/railties/lib/rails_generator/generators/applications/app/scm
- vendor/rails/railties/lib/rails_generator/generators/components
- vendor/rails/railties/lib/rails_generator/generators/components/controller
- vendor/rails/railties/lib/rails_generator/generators/components/controller/templates
- vendor/rails/railties/lib/rails_generator/generators/components/helper
- vendor/rails/railties/lib/rails_generator/generators/components/helper/templates
- vendor/rails/railties/lib/rails_generator/generators/components/integration_test
- vendor/rails/railties/lib/rails_generator/generators/components/integration_test/templates
- vendor/rails/railties/lib/rails_generator/generators/components/mailer
- vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates
- vendor/rails/railties/lib/rails_generator/generators/components/metal
- vendor/rails/railties/lib/rails_generator/generators/components/metal/templates
- vendor/rails/railties/lib/rails_generator/generators/components/migration
- vendor/rails/railties/lib/rails_generator/generators/components/migration/templates
- vendor/rails/railties/lib/rails_generator/generators/components/model
- vendor/rails/railties/lib/rails_generator/generators/components/model/templates
- vendor/rails/railties/lib/rails_generator/generators/components/observer
- vendor/rails/railties/lib/rails_generator/generators/components/observer/templates
- vendor/rails/railties/lib/rails_generator/generators/components/performance_test
- vendor/rails/railties/lib/rails_generator/generators/components/performance_test/templates
- vendor/rails/railties/lib/rails_generator/generators/components/plugin
- vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates
- vendor/rails/railties/lib/rails_generator/generators/components/resource
- vendor/rails/railties/lib/rails_generator/generators/components/resource/templates
- vendor/rails/railties/lib/rails_generator/generators/components/scaffold
- vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates
- vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
- vendor/rails/railties/lib/rails_generator/generators/components/session_migration
- vendor/rails/railties/lib/rails_generator/generators/components/session_migration/templates
- vendor/rails/railties/lib/rails_generator/scripts
- vendor/rails/railties/lib/tasks
- files modified:
- README
added
removed
vendor/rails/actionpack/test/fixtures/layouts/talk_from_action.erb
