aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| | |
* | | Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-1/+1
|/ / | | | | | | | | Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it.
* | Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-081-2/+4
|\ \ | |/ |/| This updates rails to use edge rack
| * Upgraded rackJarmo Isotalo2014-05-191-2/+4
| | | | | | | | | | | | | | | | As Rack has some non backwards compatible changes added required modifications to keep behaviour in rails close to same as before. Also modified generators to include rack/rack for not yet released version of rack
* | Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-061-1/+1
| | | | | | | | adapter, fixed from #16057 [ci skip]
* | Merge pull request #16057 from akshay-vishnoi/doc_changeZachary Scott2014-07-061-1/+1
|\ \ | | | | | | [ci skip] /sqlite/i --> SQLite
| * | [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-061-1/+1
| | |
* | | Merge pull request #16046 from grosser/grosser/cleangenRafael Mendonça França2014-07-041-2/+1
|\ \ \ | | | | | | | | Do not load rails without loading bundler
| * | | remove bundler magicgrosser2014-07-031-2/+1
| | | |
* | | | Display notice in index.html pages in scaffolded generated viewsArun Agrawal2014-07-043-1/+11
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044
* | | Revert "Merge pull request #15394 from ↵Rafael Mendonça França2014-07-021-90/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md
* | | Rename preview_enabled option to show_previewsRafael Mendonça França2014-07-012-10/+10
| | |
* | | Add configuration to enable mail previewsLeonard Garvey2014-07-013-2/+38
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `config.action_mailer.preview_enabled` This allows mail previewing to be enabled easily in non-development environments such as staging. The default is set to true for development so no changes should be required to existing Rails applications. The mail preview path can still be configured using the existing `config.action_mailer.preview_path` configuration option. Adding this avoids devs from having to do stuff like: https://gist.github.com/lengarvey/fa2c9bd6cdbeba96526a Update actionmailer/CHANGELOG with new configuration. Update configuring guide with new configuratation. Add `config.action_mailer.preview_path` to configuring guide.
* | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-271-0/+38
|\ \ | | | | | | | | | | | | | | | Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver]
| * | Improvements per code review.Rafael Chacón2014-06-271-0/+25
| | | | | | | | | | | | | | | | | | * General style fixes. * Add changes to configuration guide. * Add missing tests.
| * | Add always_permitted_parameters as an option.Rafael Chacón2014-06-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | * This commit adds back the always_permitted_parameters configuration option to strong paramaters. * The initial pull requests where this feature was added are the following: - https://github.com/rails/rails/pull/12682 - https://github.com/rails/strong_parameters/pull/174
* | | Talk about config.assts.version move tooRafael Mendonça França2014-06-271-1/+1
| | | | | | | | | | | | Closes #15942
* | | Add a test for db:migrate:status to check missing file scenarioViktar Basharymau2014-06-271-0/+15
| | |
* | | Require shellwords since it is dependecy of this fileRafael Mendonça França2014-06-261-0/+2
| | | | | | | | | | | | Closes #15919
* | | Merge pull request #15885 from lucasmazza/lm-skip-routesRafael Mendonça França2014-06-242-2/+13
|\ \ \ | | | | | | | | Add a '--skip-routes' flag for the Controller generator.
| * | | Add a '--skip-routes' flag for the Controller generator.Lucas Mazza2014-06-242-2/+13
| | | | | | | | | | | | | | | | | | | | This way it is possible to skip the addition of the 'get "foo/bar"' routes when generating a controller.
* | | | `:nodoc: all` does not remove the constants from the API. [ci skip]Yves Senn2014-06-241-2/+2
|/ / / | | | | | | | | | | | | Need to add individual `:nodoc:` for nested classes / modules to completely remove the constants from the API.
* | | Titling the model name in views generated by scaffold.Amit Suryavanshi2014-06-183-3/+3
| | | | | | | | | | | | | | | eg. rails g scaffold UserProfile will have in index.html.erb "Listing User Profiles" rather than Listing user_profiles.
* | | Deprecate Rails::Rack::LogTailerRafael Mendonça França2014-06-172-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | It was being used by Rails for show the development logs but since Rails 4 it is not being used anymore on the framework. This class seems to be private but it were part of the public API we are deprecating before removing.
* | | initialize the right variableRafael Mendonça França2014-06-171-1/+1
| | |
* | | :scissors:Rafael Mendonça França2014-06-171-8/+8
| | |
* | | Add a generic --skip-gems options to generatorRafael Mendonça França2014-06-173-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove --skip-turbolinks. This option is useful if users want to remove some gems like jbuilder, turbolinks, coffee-rails, etc that don't have specific options on the generator. rails new my_app --skip-gems turbolinks coffee-rails
* | | Merge pull request #15716 from schuetzm/skip-turbolinksRafael Mendonça França2014-06-172-2/+21
|\ \ \ | | | | | | | | Add an option to skip installation of Turbolinks
| * | | Add an option to skip installation of TurbolinksMarc Schütz2014-06-142-2/+21
| | | |
* | | | allow preview interceptors to be registered through `config.action_mailer`.Yves Senn2014-06-151-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was partially broken because `preview_interceptors=` just assigned the raw values, whithout going through `register_preview_interceptor`. Now the Action Mailer railtie takes care of the `preview_interceptors` option. This commit is a partial revert of: Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base" This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be. /cc @kuldeepaggarwal @y-yagi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:32:38 +0000