Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #18049 from yuki3738/fix_rails_db_command_error | Rafael Mendonça França | 2014-12-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Add a code checking about file or not to the rails db command | |||||
| * | | Add a code checking about file or not to the rails db command | yuki3738 | 2014-12-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | English fix [ci skip] | George Millo | 2014-12-16 | 1 | -3/+3 | |
|/ / | ||||||
* | | 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 | |
| | | | ||||||
* | | | 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 | 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. | |||||
* | | | FIX: absolute_path may be nil for code added via instance_eval | Sam | 2014-12-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Pass symbol as an argument instead of a block | Erik Michaels-Ober | 2014-11-29 | 10 | -22/+18 | |
| | | | ||||||
* | | | 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 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | 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 |