Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only add debugger/byebug if on MRI | Arthur Neves | 2014-12-22 | 1 | -1/+1 |
| | |||||
* | Fix typo in nodoc | rochefort | 2014-12-22 | 1 | -1/+1 |
| | |||||
* | prefer single quotes, by the beard of the prophet! | Xavier Noria | 2014-12-20 | 1 | -10/+10 |
| | |||||
* | Make bin/setup portable | Tim Pope | 2014-12-19 | 1 | -7/+9 |
| | |||||
* | Merge pull request #18100 from chancancode/serve_static_files | Godfrey Chan | 2014-12-19 | 2 | -4/+5 |
| | | | | | | Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md | ||||
* | Fix Duplicate web-console entries in Gemfile | NorimasaAndo | 2014-12-14 | 2 | -10/+4 |
| | |||||
* | New applications should use sass-rails 5.0 | Rafael Mendonça França | 2014-12-12 | 1 | -6/+1 |
| | |||||
* | Rails master requires arel master | Rafael Mendonça França | 2014-12-12 | 1 | -2/+8 |
| | |||||
* | Align the GemfileEntry API with stable branches | Godfrey Chan | 2014-12-12 | 1 | -5/+9 |
| | | | | See 63462ec | ||||
* | [ci skip] Fix typo | yui-knk | 2014-12-09 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -3/+5 |
|\ | | | | | Don't remove mailer layouts files | ||||
| * | Don't remove mailer layouts files | yuuji.yaginuma | 2014-11-27 | 1 | -3/+5 |
| | | |||||
* | | Silence Minitest for plugin tests. | Guo Xiang Tan | 2014-12-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Pass symbol as an argument instead of a block | Erik Michaels-Ober | 2014-11-29 | 5 | -9/+7 |
| | | |||||
* | | adds missing period in test.rb [ci skip] | Xavier Noria | 2014-11-29 | 1 | -1/+1 |
| | | |||||
* | | We don't need to use sass-rails 5.0.0.beta | Rafael Mendonça França | 2014-11-28 | 1 | -2/+1 |
| | | |||||
* | | Revert "Test against rack master" | Santiago Pastorino | 2014-11-27 | 1 | -2/+2 |
|/ | | | | This reverts commit 2a4e14db981e38611667d407a975600ee720ada7. | ||||
* | Test against rack master | Rafael Mendonça França | 2014-11-26 | 1 | -2/+2 |
| | |||||
* | 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 | ||||
* | | 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 |
| | | |||||
* | | 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 | ||||
* | | 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 | 1 | -1/+2 |
| | | | | | | | | | | | | 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 | 1 | -2/+2 |
|/ | | | | | | | | | 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. | ||||
* | 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__) ``` | ||||
* | Added 'tzinfo-data' if we are using jruby | Luca Simone | 2014-10-29 | 1 | -2/+2 |
| | |||||
* | Add back --skip-turbolinks and remove --skip-gems | Rafael Mendonça França | 2014-10-26 | 1 | -6/+9 |
| | | | | | | | For the most part of cases --skip-gems option just remove one line in the Gemfile. This is not worth for the complexity it adds. Closes #17196 | ||||
* | Merge pull request #17302 from ↵ | Rafael Mendonça França | 2014-10-18 | 2 | -4/+4 |
| | | | | | | claudiob/replace-slower-block-call-with-faster-yield Replace (slower) block.call with (faster) yield | ||||
* | Revert "Replace (slower) block.call with (faster) yield" | Zachary Scott | 2014-10-18 | 2 | -4/+4 |
| | | | | This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6. | ||||
* | Replace (slower) block.call with (faster) yield | claudiob | 2014-10-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ``` | ||||
* | Merge pull request #17292 from tricknotes/generator-test-doc | Rafael Mendonça França | 2014-10-16 | 1 | -1/+1 |
|\ | | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip] | ||||
| * | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip] | Ryunosuke SATO | 2014-10-17 | 1 | -1/+1 |
| | | | | | | | | | | `cleanup_destination_root` method is not found anywhere. Instead, `prepare_destination` clean up distination root on setup. | ||||
* | | Use released rails-dom-testing | Rafael Mendonça França | 2014-10-16 | 1 | -2/+0 |
|/ |