aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| |
* | No need to sync config.secret_token and secrets.secret_tokenRafael Mendonça França2014-11-102-41/+4
| | | | | | | | Just prefer secrets over config
* | Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-106-15/+172
|\ \ | | | | | | | | | Allow fallback to LegacyKeyGenerator when secret_key_base is not set but secrets.secret_token is
| * | `secret_token` is now saved in `Rails.application.secrets.secret_token`Benjamin Fleischer2014-11-026-15/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `secrets.secret_token` is now used in all places `config.secret_token` was - `secrets.secret_token`, when not present in `config/secrets.yml`, now falls back to the value of `config.secret_token` - when `secrets.secret_token` is set, it over-writes `config.secret_token` so they are the same (for backwards-compatibility) - Update docs to reference app.secrets in all places - Remove references to `config.secret_token`, `config.secret_key_base` - Warn that missing secret_key_base is deprecated - Add tests for secret_token, key_generator, and message_verifier - the legacy key generator is used with the message verifier when secrets.secret_key_base is blank and secret_token is set - app.key_generator raises when neither secrets.secret_key_base nor secret_token are set - app.env_config raises when neither secrets.secret_key_base nor secret_token are set - Add changelog Run focused tests via ruby -w -Itest test/application/configuration_test.rb -n '/secret_|key_/'
* | | added description for rails generators, and fixed sentence formation for ↵Rishi Jain2014-11-102-0/+4
| | | | | | | | | | | | active_support/notifications [ci skip]
* | | Fix comment of SourceAnnotationExtractor#find_inyui-knk2014-11-091-3/+2
| | | | | | | | | | | | | | | | | | Commit(810af6f) changed which extensions are taken into account, so make to match comment of find_in. And sort extensions to follow the added order.
* | | Documenting Rails::Info module [ci skip]Zachary Scott2014-11-081-0/+3
| | |
* | | Add test/jobs files in `rake stats`Arun Agrawal2014-11-052-1/+3
| | |
* | | Add skip-turbolinks entry to 4.2 release notes and improve changelogCarlos Antonio da Silva2014-11-051-1/+1
| | | | | | | | | | | | [ci skip]
* | | add lib to $LOAD_PATH on application inhertence. fixes #17106Aaron Patterson2014-11-043-9/+16
| | |
* | | add a test for #17106Aaron Patterson2014-11-042-0/+22
| | |
* | | Revert "Replace String index juggling with Pathname goodness in ↵yuuji.yaginuma2014-11-021-0/+10
|/ / | | | | | | | | | | | | | | db:fixtures:load" This reverts commit 482fdad5ef8a73688b50bba3991dd4ef6f286edd. Fixes #17237.
* | Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-301-1/+1
| |
* | On larger screens the email preview iframe is being limited to a height of ↵Edwin Wills2014-10-291-1/+4
| | | | | | | | 800 pixels, and the full available screen size is not being used.
* | Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\ \ | | | | | | Added 'tzinfo-data' if we are using jruby
| * | Added 'tzinfo-data' if we are using jrubyLuca Simone2014-10-291-2/+2
| | |
* | | edit pass over all warningsXavier Noria2014-10-281-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* | Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\ \ | | | | | | Fix rbx generated Gemfile regex