aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16359 from skanev/after-bundle-in-rails-templatesYves Senn2014-08-064-0/+39
|\ | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md
| * Add an after_bundle callback in Rails templatesStefan Kanev2014-08-034-0/+39
| | | | | | | | | | | | The template runs before the generation of binstubs – this does not allow to write one, that makes an initial commit to version control. It is solvable by adding an after_bundle callback.
* | Revert "Revert "Merge pull request #15394 from ↵Yves Senn2014-08-061-1/+90
| | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format"" This reverts commit 5c87b5c5248154cf8aa76cce9a24a88769de022d.
* | We don't need parenthesis for thisGuillermo Iguaran2014-08-051-1/+1
| |
* | Fix digest ETAG test.Arthur Neves2014-08-051-1/+1
| | | | | | | | | | | | After https://github.com/rack/rack/commit/12528d4567d8e6c1c7e9422fee6cd8b43c4389bf ETag will include a `W/` before the digest.
* | Bring back the helpers testsJosé Valim2014-08-053-0/+50
| | | | | | | | | | Also keep the hook as other tools may rely on it, we just don't do anything by default on Rails.
* | Fix typo [ci skip]Jon Atack2014-08-041-1/+1
| |
* | Explain why we use asset digests, not what a setter doesDavid Heinemeier Hansson2014-08-032-2/+4
| |
* | Add suggestion as to how you can app the the assets load pathDavid Heinemeier Hansson2014-08-031-0/+3
| |
* | Pull in the custom configuration concept from dhh/custom_configurationDavid Heinemeier Hansson2014-08-034-1/+82
| |
* | A few more tests asserting the presence of helper test stubsDavid Heinemeier Hansson2014-08-036-17/+0
| |
* | Stubs are no longer generated for helpers, so dont test for itDavid Heinemeier Hansson2014-08-031-4/+0
| |
* | Change the production log level default from :info to :debug. All production ↵David Heinemeier Hansson2014-08-031-2/+2
| | | | | | | | apps I have ever worked with has done this. Let us reflect that default. You often want those SQL quieries to be able to debug issues in production
* | Generating stubs for helper tests is overly specific. Most helpers should ↵David Heinemeier Hansson2014-08-034-75/+0
|/ | | | simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them
* Avoid defining the test if it does not need to when not on JRubyCarlos Antonio da Silva2014-07-301-2/+2
|
* Use default argument when testing generators without the need for extra argsCarlos Antonio da Silva2014-07-302-7/+7
|
* Simplify path setupCarlos Antonio da Silva2014-07-301-1/+1
|
* Simplify plugin tests a bit, leave the regexp work for minitestCarlos Antonio da Silva2014-07-301-6/+6
|
* Invert unless..else conditions on JRuby checksCarlos Antonio da Silva2014-07-302-12/+12
|
* Remove some more globals from testsCarlos Antonio da Silva2014-07-301-26/+26
| | | | | We are using blocks here so we have access to the environment around them, no need for globals.
* Fix / improve some assertionsCarlos Antonio da Silva2014-07-301-6/+4
|
* Remove some globals from configuration testsCarlos Antonio da Silva2014-07-301-20/+20
|
* Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-303-3/+55
| | | | | | | | | | | Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead. Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR. Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead. The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`. Paired @sgrif & @schneems
* Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"Santiago Pastorino2014-07-302-2/+2
| | | | | | | This reverts commit f632f79b8dcd144408c66a544984b2ba9cf52f87, reversing changes made to 98c7fe87690ca4de6c46e8f69806e82e3f8af42d. Closes #16343
* Merge pull request #16328 from noinkling/template_password_confirmation_fixYves Senn2014-07-292-1/+6
|\ | | | | | | Give password_confirmation div the "field" class in the scaffold generator "_form" partial
| * Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
|/
* Additional clarification on password:digest in scaffold and model generator ↵noinkling2014-07-252-4/+16
| | | | help [ci skip]
* Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
|
* Remove mocha usageRafael Mendonça França2014-07-231-2/+5
|
* Fix syntax errorRafael Mendonça França2014-07-231-1/+2
|
* Dev and edge application and plugins need to include i18n masterRafael Mendonça França2014-07-231-1/+2
|
* Merge pull request #16267 from robin850/rbx-yamlRafael Mendonça França2014-07-232-0/+22
|\ | | | | Set Psych as the YAML engine for Rubinius
| * Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-232-0/+22
| | | | | | | | | | | | | | | | | | | | Since the rubysl-yaml gem doesn't ship with Psych by default because of its dependency on libyaml, on Rubinius, the default engine is Syck. However, if we want to be able to run the application safely on different rubies, we need to make people using Rubinius rely on Psych. See http://git.io/uuLVag for further information.
* | Do not set enforce_available_locales to i18n 0.7Rafael Mendonça França2014-07-231-18/+2
|/ | | | | | Now the default is always true. Users still can set it using config.i18n.enforce_available_locales.
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-1913-79/+170
|\ | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-197-0/+7
| | | | | | | | | | | | | | | | | | | | | | We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal
| * Stop using mocha on dbconsole_testRafael Mendonça França2014-07-151-44/+68
| |
| * Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
| |
| * Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
| |
| * Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
| |
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
| |
* | Merge pull request #16212 from ↵Rafael Mendonça França2014-07-181-1/+2
|\ \ | | | | | | | | | | | | | | | aantix/additional_migration_conflict_help_messaging Additional help messaging to help the user resolve a conflicted migration
| * | Modified migration conflict message to remove the string concatenation.Jim Jones2014-07-181-3/+3
| | |
| * | Added additional help messaging when there's scaffolding being generated and ↵Jim Jones2014-07-171-1/+2
| | | | | | | | | | | | | | | | | | a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
* | | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-1/+1
|/ / | | | | | | | | | | | | | | The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | Keep quietly and capture undeprecated on your suiteRafael Mendonça França2014-07-156-2/+77
| |
* | Add Rails::Application#config_forRafael Mendonça França2014-07-153-0/+134
| | | | | | | | | | This is a convenience for loading configuration for the current Rails environment.
* | Add ability to extend `rails server` command options parserAndrey Chernih2014-07-111-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change it will be possible to add additional options to the `option_parser` like this: require 'rails/commands/server' module Rails class Server < ::Rack::Server class Options def option_parser_with_open(options) parser = option_parser_without_open options parser.on('-o', '--open', 'Open in default browser') { options[:open] = true } parser end alias_method_chain :option_parser, :open end def start_with_open start_without_open do `open http://localhost:3000` if options[:open] end end alias_method_chain :start, :open end end
* | Merge pull request #16132 from tgxworld/fix_test_not_unsubscribingSantiago Pastorino2014-07-111-2/+2
|\ \ | | | | | | Fix incorrect unsubscription.
| * | Fix incorrect unsubscription.Guo Xiang Tan2014-07-111-2/+2
| | |