Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | 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 |
|/ | |||||
* | Generate mailer layouts even if no action is given. | Guo Xiang Tan | 2014-11-25 | 1 | -4/+4 |
| | |||||
* | 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 | 1 | -4/+4 |
| | |||||
* | Merge pull request #17646 from andyjeffries/html_layout_fix | David Heinemeier Hansson | 2014-11-25 | 3 | -0/+26 |
|\ | | | | | Creating mailer layouts by default, including html and body tags | ||||
| * | Removing unnecessary File.join calls | Andy Jeffries | 2014-11-24 | 1 | -1/+1 |
| | | |||||
| * | Creates an ApplicationMailer and layout by default, including html and body ↵ | Andy Jeffries | 2014-11-21 | 3 | -0/+26 |
| | | | | | | | | tags to reduce spam score | ||||
* | | Fix sprockets-rails dependency dance | Arthur Neves | 2014-11-24 | 1 | -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/head | Santiago Pastorino | 2014-11-24 | 1 | -2/+2 |
|\ \ | | | | | | | Replace ActionDispatch::Head with Rack::Head. | ||||
| * | | Replace ActionDispatch::Head with Rack::Head. | yui-knk | 2014-11-24 | 1 | -2/+2 |
| | | | |||||
* | | | Fix wrong path in comments about stylesheets | Richard Littauer | 2014-11-24 | 1 | -1/+1 |
| | | | | | | | | | | | | I put the wrong path in my last PR by accident. Fixed here. Related to #17742 | ||||
* | | | Change 'of plugins' syntax | Richard Littauer | 2014-11-24 | 4 | -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 Senn | 2014-11-21 | 1 | -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 | ||||
* | | if you want to ignore all the logfiles, no need for extensions | Shunsuke Aida | 2014-11-21 | 1 | -1/+1 |
| | | |||||
* | | Generate new applications with the right rails-dom-testing version | Rafael Mendonça França | 2014-11-17 | 1 | -2/+4 |
| | | |||||
* | | Fix typo. | Guo Xiang Tan | 2014-11-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #17640 from michaeljayt/spring-not-working-in-cygwin | Rafael Mendonça França | 2014-11-17 | 1 | -1/+1 |
|\ \ | | | | | | | Skip spring install in Cygwin due to fork() bad support. | ||||
| * | | Skip spring install in Cygwin due to fork() bad support. | michaeljayt | 2014-11-17 | 1 | -1/+1 |
| |/ | | | | | | | See also: https://www.cygwin.com/faq.html#faq.using.fixing-fork-failures | ||||
* | | Merge pull request #17645 from georgemillo/master | Rafael Mendonça França | 2014-11-17 | 1 | -2/+2 |
|\ \ | | | | | | | Minor English fixes in docs [ci skip] | ||||
| * | | Minor English fixes in docs [ci skip] | George Millo | 2014-11-17 | 1 | -2/+2 |
| |/ | |||||
* | | Meant to describe the concept, not the setting [ci skip] | Godfrey Chan | 2014-11-17 | 1 | -1/+1 |
| | | |||||
* | | Deprecate different default for `log_level` in production | Godfrey Chan | 2014-11-17 | 3 | -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 Chan | 2014-11-17 | 2 | -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. | ||||
* | Merge pull request #17593 from igas/paths-unshift-arity | Rafael Mendonça França | 2014-11-12 | 1 | -2/+2 |
|\ | | | | | Fix Rails::Paths::Path.unshift interface | ||||
| * | Fix Rails::Paths::Path.unshift interface | Igor Kapkov | 2014-11-12 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #17348 from DavidGeukers/rake_test_all | David Heinemeier Hansson | 2014-11-12 | 1 | -3/+20 |
|\ \ | |/ |/| | simplify rake test vs rake test:all | ||||
| * | Simplify rake test vs rake test:all | David Geukers | 2014-11-10 | 1 | -3/+20 |
| | | | | | | | | 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 space | claudiob | 2014-11-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Replaces the following in two places: ```diff -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) ``` | ||||
* | | No need to sync config.secret_token and secrets.secret_token | Rafael Mendonça França | 2014-11-10 | 1 | -7/+2 |
| | | | | | | | | Just prefer secrets over config | ||||
* | | Merge pull request #16535 from bf4/patch-1 | Rafael Mendonça França | 2014-11-10 | 1 | -4/+16 |
|\ \ | | | | | | | | | | 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 Fleischer | 2014-11-02 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `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 Jain | 2014-11-10 | 2 | -0/+4 |
| | | | | | | | | | | | | active_support/notifications [ci skip] | ||||
* | | | Fix comment of SourceAnnotationExtractor#find_in | yui-knk | 2014-11-09 | 1 | -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 Scott | 2014-11-08 | 1 | -0/+3 |
| | | | |||||
* | | | Add test/jobs files in `rake stats` | Arun Agrawal | 2014-11-05 | 2 | -1/+3 |
| | | | |||||
* | | | add lib to $LOAD_PATH on application inhertence. fixes #17106 | Aaron Patterson | 2014-11-04 | 2 | -8/+14 |
|/ / | |||||
* | | Prepare for 4.2.0.beta4 release | Godfrey Chan | 2014-10-30 | 1 | -1/+1 |
| | | |||||
* | | On larger screens the email preview iframe is being limited to a height of ↵ | Edwin Wills | 2014-10-29 | 1 | -1/+4 |
| | | | | | | | | 800 pixels, and the full available screen size is not being used. | ||||
* | | Merge pull request #17423 from lukefx/jruby_windows_tzinfo | Santiago Pastorino | 2014-10-29 | 1 | -2/+2 |
|\ \ | | | | | | | Added 'tzinfo-data' if we are using jruby | ||||
| * | | Added 'tzinfo-data' if we are using jruby | Luca Simone | 2014-10-29 | 1 | -2/+2 |
| | | |