Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip] Fix typo | yui-knk | 2014-12-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #17896 from GBH/globbing_route_mailer_preview | Rafael Mendonça França | 2014-12-08 | 1 | -0/+11 |
|\ | | | | | fixing mailer previews for apps with globbing route | ||||
| * | fixing mailer previews for apps with globbing route | Oleg | 2014-12-03 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #17953 from kirs/test-activejob-generator | Rafael Mendonça França | 2014-12-08 | 1 | -0/+29 |
|\ \ | | | | | | | Test coverage for ActiveJob generator | ||||
| * | | Test coverage for ActiveJob generator | Kir Shatrov | 2014-12-07 | 1 | -0/+29 |
| | | | |||||
* | | | Use latest web-console when using --dev or --edge | Sam Ruby | 2014-12-05 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | Fixes: http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log | ||||
* | | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts | Rafael Mendonça França | 2014-12-04 | 2 | -3/+20 |
|\ \ \ | | | | | | | | | Don't remove mailer layouts files | ||||
| * | | | Don't remove mailer layouts files | yuuji.yaginuma | 2014-11-27 | 2 | -3/+20 |
| | | | | |||||
* | | | | Removed use of mocha in the info_controller tests | Prathamesh Sonpatki | 2014-12-03 | 1 | -5/+4 |
| |_|/ |/| | | |||||
* | | | Fix "nonexistent" typo in tests | Melissa Xie | 2014-12-02 | 1 | -1/+1 |
| | | | |||||
* | | | require 'rake' before requiring Rake tasks | Akira Matsuda | 2014-12-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Without this, % rails r "require 'rails/tasks'" would cause a NoMethodError: undefined method `desc' for main:Object | ||||
* | | | Silence Minitest for plugin tests. | Guo Xiang Tan | 2014-12-02 | 2 | -1/+4 |
| |/ |/| | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17340. Use Minitest::BacktraceFilter instead of removing all silencers. This will allow the backtrace for all libraries in the plugin to be shown while removing noise generated by Minitest's backtrace. | ||||
* | | Merge pull request #17866 from bogdan/default-form-builder | Santiago Pastorino | 2014-12-01 | 1 | -0/+39 |
|\ \ | | | | | | | Bugfix config.action_view.default_form_builder option | ||||
| * | | Bugfix config.action_view.default_form_builder option | Bogdan Gusiev | 2014-12-01 | 1 | -0/+39 |
| | | | |||||
* | | | FIX: absolute_path may be nil for code added via instance_eval | Sam | 2014-12-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-as | Sean Griffin | 2014-11-29 | 1 | -0/+20 |
|\ \ \ | | | | | | | | | Pure rack apps can be mounted with a name | ||||
| * | | | Pure rack apps can be mounted with a name | Jean Boussier | 2014-11-29 | 1 | -0/+20 |
| |/ / | | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492 | ||||
* | | | Pass symbol as an argument instead of a block | Erik Michaels-Ober | 2014-11-29 | 11 | -23/+19 |
| | | | |||||
* | | | adds missing period in test.rb [ci skip] | Xavier Noria | 2014-11-29 | 1 | -1/+1 |
| | | | |||||
* | | | Bump required Ruby version to 2.1.0 | claudiob | 2014-11-28 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files. | ||||
* | | | We don't need to use sass-rails 5.0.0.beta | Rafael Mendonça França | 2014-11-28 | 1 | -2/+1 |
| | | | |||||
* | | | Start Rails 5 development :tada: | Rafael Mendonça França | 2014-11-28 | 2 | -211/+4 |
|/ / | | | | | | | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9. | ||||
* | | docs, AR no longer makes use of `test:prepare`. [ci skip] | Yves Senn | 2014-11-28 | 1 | -1/+2 |
| | | | | | | | | | | | | Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088 /cc @metaskills | ||||
* | | Revert "Test against rack master" | Santiago Pastorino | 2014-11-27 | 1 | -2/+2 |
| | | | | | | | | This reverts commit 2a4e14db981e38611667d407a975600ee720ada7. | ||||
* | | rails -> bin/rails in index.html | Xavier Noria | 2014-11-27 | 1 | -1/+1 |
|/ | |||||
* | Test against rack master | Rafael Mendonça França | 2014-11-26 | 1 | -2/+2 |
| | |||||
* | Merge pull request #17761 from pschrammel/master | Yves Senn | 2014-11-26 | 1 | -1/+1 |
|\ | | | | | | | be more general with adapter name | ||||
| * | be more general with adapter name | Peter Schrammel | 2014-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #17782 from cheba/engine-root-master | Rafael Mendonça França | 2014-11-26 | 1 | -1/+1 |
|\ \ | | | | | | | Use absolute_path of caller_locations to infer engine root | ||||
| * | | Use absolute_path of caller_locations to infer engine root | Alexander Mankuta | 2014-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | According to documentation `path` only returns file names. On MRI it's not the case but it's likely a bug in MRI. | ||||
* | | | Provide support for SQL Server connections with dbconsole using sqsh | Juan Ignacio Pumarino | 2014-11-26 | 1 | -0/+15 |
|/ / | |||||
* | | Use jquery-rails 4.0.0 | Rafael Mendonça França | 2014-11-25 | 1 | -8/+2 |
| | | |||||
* | | Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1 | Sean Griffin | 2014-11-25 | 1 | -1/+1 |
|\ \ | | | | | | | Use web_console 2.0 for 4.2.0.rc1 release | ||||
| * | | Use web_console 2.0 for 4.2.0.rc1 release | Genadi Samokovarov | 2014-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This one replaces the notable web-console mentions in guide and the default Gemfile. | ||||
* | | | Generators add foreign keys on references | Derek Prior | 2014-11-25 | 3 | -1/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you run a generator such as: ``` rails generate model accounts supplier:references ``` The resulting migration will now add the corresponding foreign key constraint unless the reference was specified to be polymorphic. | ||||
* | | | Fix syntax error :bomb: | Rafael Mendonça França | 2014-11-25 | 1 | -2/+2 |
|/ / | |||||
* | | Use released rails-dom-testing | Rafael Mendonça França | 2014-11-25 | 1 | -2/+0 |
| | | |||||
* | | bring back `db:test:prepare`. | Yves Senn | 2014-11-25 | 2 | -9/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts deprecations added in #13528. The task is brought back for two reasons: 1. Give plugins a way to hook into the test database initialization process 2. Give the user a way to force a test database synchronization While `test:prepare` is still a dependency of every test task, `db:test:prepare` no longer hooks into it. This means that `test:prepare` runs before the schema is synchronized. Plugins, which insert data can now hook into `db:test:prepare`. The automatic schema maintenance can't detect when a migration is rolled-back, modified and reapplied. In this case the user has to fall back to `db:test:prepare` to force the synchronization to happen. | ||||
* | | tests, run `test_test.rb` with `RAILS_ENV=test`. | Yves Senn | 2014-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | The tests to verify our testing setup used `RAILS_ENV=development` to execute the tests. Let's keep it as close to a real-world setup as possible. | ||||
* | | Added tests for log_level deprecation | Godfrey Chan | 2014-11-25 | 1 | -13/+18 |
| | | | | | | | | | | | | Closes #17756 [Godfrey Chan, Zachary Scott] | ||||
* | | Set the test_order in the basic app as well, see 58e8b48 | Godfrey Chan | 2014-11-25 | 2 | -0/+26 |
| | | | | | | | | This removes the unwanted deprecation warnings in the tests | ||||
* | | Set the default log_level to info in all tests | Godfrey Chan | 2014-11-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | This is a follow-up to 116de07. That change was for two reasons: 1) speed up the tests by reducing the amount of log lines 2) avoid a deprecation warning from a6de6f5. This setting need to be on the basic app too, otherwise the deprecation warning will show up on other unrelated test cases. | ||||
* | | Merge pull request #17757 from zzak/railties-default-to-debug-log_level | Godfrey Chan | 2014-11-25 | 1 | -0/+1 |
|\ \ | | | | | | | Always default the log_level to :info for Railties | ||||
| * | | Always default the log_level to :info for Railties | Zachary Scott | 2014-11-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #17755 from zzak/changelog-for-16622 | Godfrey Chan | 2014-11-25 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip] | ||||
| * | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip] | Zachary Scott | 2014-11-24 | 1 | -0/+4 |
| |/ | |||||
* | | Generate mailer layouts even if no action is given. | Guo Xiang Tan | 2014-11-25 | 2 | -4/+6 |
| | | |||||
* | | MailerGenerator should inherit from Base. | Guo Xiang Tan | 2014-11-25 | 1 | -3/+4 |
| | | |||||
* | | Add tests which were incorrectly removed. | Guo Xiang Tan | 2014-11-25 | 3 | -4/+10 |
| | | |||||
* | | Merge pull request #17646 from andyjeffries/html_layout_fix | David Heinemeier Hansson | 2014-11-25 | 5 | -10/+48 |
|\ \ | | | | | | | Creating mailer layouts by default, including html and body tags |