aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18049 from yuki3738/fix_rails_db_command_errorRafael Mendonça França2014-12-161-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 commandyuki37382014-12-161-1/+1
| |
* | English fix [ci skip]George Millo2014-12-161-3/+3
|/
* Fix Duplicate web-console entries in GemfileNorimasaAndo2014-12-142-10/+4
|
* New applications should use sass-rails 5.0Rafael Mendonça França2014-12-121-6/+1
|
* Rails master requires arel masterRafael Mendonça França2014-12-121-2/+8
|
* Align the GemfileEntry API with stable branchesGodfrey Chan2014-12-121-5/+9
| | | | See 63462ec
* [ci skip] Fix typoyui-knk2014-12-091-1/+1
|
* Use latest web-console when using --dev or --edgeSam Ruby2014-12-051-0/+10
| | | | | | Fixes: http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log
* Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-041-3/+5
|\ | | | | Don't remove mailer layouts files
| * Don't remove mailer layouts filesyuuji.yaginuma2014-11-271-3/+5
| |
* | require 'rake' before requiring Rake tasksAkira Matsuda2014-12-031-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 Tan2014-12-021-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_evalSam2014-12-011-1/+1
| |
* | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-2910-22/+18
| |
* | adds missing period in test.rb [ci skip]Xavier Noria2014-11-291-1/+1
| |
* | Bump required Ruby version to 2.1.0claudiob2014-11-281-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.betaRafael Mendonça França2014-11-281-2/+1
| |
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-281-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 Senn2014-11-281-1/+2
| | | | | | | | | | | | Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088 /cc @metaskills
* | Revert "Test against rack master"Santiago Pastorino2014-11-271-2/+2
| | | | | | | | This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
* | rails -> bin/rails in index.htmlXavier Noria2014-11-271-1/+1
|/
* Test against rack masterRafael Mendonça França2014-11-261-2/+2
|
* 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.
* | | 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
|/
* Generate mailer layouts even if no action is given.Guo Xiang Tan2014-11-251-4/+4
|
* MailerGenerator should inherit from Base.Guo Xiang Tan2014-11-251-3/+4
|
* Add tests which were incorrectly removed.Guo Xiang Tan2014-11-251-4/+4
|
* Merge pull request #17646 from andyjeffries/html_layout_fixDavid Heinemeier Hansson2014-11-253-0/+26
|\ | | | | 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-213-0/+26
| | | | | | | | 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
* | 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