aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17761 from pschrammel/masterYves Senn2014-11-261-1/+1
|\ | | | | | | be more general with adapter name
| * be more general with adapter namePeter Schrammel2014-11-251-1/+1
| |
* | Merge pull request #17782 from cheba/engine-root-masterRafael Mendonça França2014-11-261-1/+1
|\ \ | | | | | | Use absolute_path of caller_locations to infer engine root
| * | Use absolute_path of caller_locations to infer engine rootAlexander Mankuta2014-11-261-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 sqshJuan Ignacio Pumarino2014-11-261-0/+15
|/ /
* | Use jquery-rails 4.0.0Rafael Mendonça França2014-11-251-8/+2
| |
* | Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1Sean Griffin2014-11-251-1/+1
|\ \ | | | | | | Use web_console 2.0 for 4.2.0.rc1 release
| * | Use web_console 2.0 for 4.2.0.rc1 releaseGenadi Samokovarov2014-11-261-1/+1
| | | | | | | | | | | | | | | This one replaces the notable web-console mentions in guide and the default Gemfile.
* | | Generators add foreign keys on referencesDerek Prior2014-11-253-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ça2014-11-251-2/+2
|/ /
* | Use released rails-dom-testingRafael Mendonça França2014-11-251-2/+0
| |
* | bring back `db:test:prepare`.Yves Senn2014-11-252-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 Senn2014-11-251-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 deprecationGodfrey Chan2014-11-251-13/+18
| | | | | | | | | | | | Closes #17756 [Godfrey Chan, Zachary Scott]
* | Set the test_order in the basic app as well, see 58e8b48Godfrey Chan2014-11-252-0/+26
| | | | | | | | This removes the unwanted deprecation warnings in the tests
* | Set the default log_level to info in all testsGodfrey Chan2014-11-251-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_levelGodfrey Chan2014-11-251-0/+1
|\ \ | | | | | | Always default the log_level to :info for Railties
| * | Always default the log_level to :info for RailtiesZachary Scott2014-11-241-0/+1
| | |
* | | Merge pull request #17755 from zzak/changelog-for-16622Godfrey Chan2014-11-251-0/+4
|\ \ \ | |_|/ |/| | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]
| * | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]Zachary Scott2014-11-241-0/+4
| |/
* | Generate mailer layouts even if no action is given.Guo Xiang Tan2014-11-252-4/+6
| |
* | MailerGenerator should inherit from Base.Guo Xiang Tan2014-11-251-3/+4
| |
* | Add tests which were incorrectly removed.Guo Xiang Tan2014-11-253-4/+10
| |
* | Merge pull request #17646 from andyjeffries/html_layout_fixDavid Heinemeier Hansson2014-11-255-10/+48
|\ \ | | | | | | Creating mailer layouts by default, including html and body tags
| * | Removing unnecessary File.join callsAndy Jeffries2014-11-241-1/+1
| | |
| * | Creates an ApplicationMailer and layout by default, including html and body ↵Andy Jeffries2014-11-215-10/+48
| | | | | | | | | | | | tags to reduce spam score
* | | Fix sprockets-rails dependency danceArthur Neves2014-11-241-2/+0
| |/ |/| | | | | | | | | - Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it - Also allow sprockets-rails >= 2.0.0
* | Merge pull request #17737 from yui-knk/fix/headSantiago Pastorino2014-11-241-2/+2
|\ \ | | | | | | Replace ActionDispatch::Head with Rack::Head.
| * | Replace ActionDispatch::Head with Rack::Head.yui-knk2014-11-241-2/+2
| | |
* | | Fix wrong path in comments about stylesheetsRichard Littauer2014-11-241-1/+1
| | | | | | | | | | | | I put the wrong path in my last PR by accident. Fixed here. Related to #17742
* | | Change 'of plugins' syntaxRichard Littauer2014-11-244-4/+4
|/ / | | | | | | | | | | Currently, the docs uses a syntax that is unclear and not general American English. I've switched it to be clearer wording. Not a big fix, but may be helpful.
* | ignore all logfiles but keep the log directory. #17700 [ci skip]Yves Senn2014-11-211-1/+2
| | | | | | | | | | | | | | | | We generate a `.keep` file inside the log directory to make sure the directory itself is under version control. let's keep it that way. /cc @matthewd
* | Merge pull request #17700 from ShunsukeAida/ignore_log_as_a_wholeYves Senn2014-11-212-1/+6
|\ \ | | | | | | | | | | | | | | | why not gitignore /log as a whole? [ci skip]
| * | if you want to ignore all the logfiles, no need for extensionsShunsuke Aida2014-11-211-1/+1
|/ /
* | Generate new applications with the right rails-dom-testing versionRafael Mendonça França2014-11-171-2/+4
| |
* | Fix typo.Guo Xiang Tan2014-11-171-1/+1
| |
* | Merge pull request #17640 from michaeljayt/spring-not-working-in-cygwinRafael Mendonça França2014-11-171-1/+1
|\ \ | | | | | | Skip spring install in Cygwin due to fork() bad support.
| * | Skip spring install in Cygwin due to fork() bad support.michaeljayt2014-11-171-1/+1
| |/ | | | | | | See also: https://www.cygwin.com/faq.html#faq.using.fixing-fork-failures
* | Merge pull request #17645 from georgemillo/masterRafael Mendonça França2014-11-171-2/+2
|\ \ | | | | | | Minor English fixes in docs [ci skip]
| * | Minor English fixes in docs [ci skip]George Millo2014-11-171-2/+2
| |/
* | Meant to describe the concept, not the setting [ci skip]Godfrey Chan2014-11-171-1/+1
| |
* | Deprecate different default for `log_level` in productionGodfrey Chan2014-11-173-3/+26
| | | | | | | | | | | | This is a more conservative approach to 2602a49. Also changed the comment to be more inline with everything else in the file (describing what the config value is doing and why). People should just read the docs for alternatives.
* | Revert "Merge pull request #16622 from matthewd/default-debug"Godfrey Chan2014-11-172-3/+3
|/ | | | | | | | | This reverts commit 2602a49a8600ab52f807599bbd5b1f9c0be4214f, reversing changes made to 5d7c1057684c377bc2801c8851e99ff11ab23530. The explicit default was introduced in 21f6d72, so apps created with Rails < 4 have the commented out version, which means that this change would break those apps.
* Improve railties changelog entry and move latest to the top [ci skip]Carlos Antonio da Silva2014-11-121-8/+7
|
* Merge pull request #17593 from igas/paths-unshift-arityRafael Mendonça França2014-11-122-2/+7
|\ | | | | Fix Rails::Paths::Path.unshift interface
| * Fix Rails::Paths::Path.unshift interfaceIgor Kapkov2014-11-122-2/+7
| |
* | Merge pull request #17348 from DavidGeukers/rake_test_allDavid Heinemeier Hansson2014-11-122-3/+26
|\ \ | |/ |/| simplify rake test vs rake test:all
| * Simplify rake test vs rake test:allDavid Geukers2014-11-102-3/+26
| | | | | | | | Renames `rake test:all` to `rake test` by changing old `rake test:run` to previous version of `rake test:all`. Removes old definition of `rake test`. Also renames `rake test:all:db` to `rake test:db` and deprecates `rake test:all` & `rake test:all:db`
* | Remove unnecessary double spaceclaudiob2014-11-102-2/+2
| | | | | | | | | | | | | | | | | | Replaces the following in two places: ```diff -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) ```
* | :scissors:Rafael Mendonça França2014-11-101-1/+1
| |