aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-042-3/+20
|\
| * Don't remove mailer layouts filesyuuji.yaginuma2014-11-272-3/+20
* | Removed use of mocha in the info_controller testsPrathamesh Sonpatki2014-12-031-5/+4
* | Fix "nonexistent" typo in testsMelissa Xie2014-12-021-1/+1
* | require 'rake' before requiring Rake tasksAkira Matsuda2014-12-031-0/+2
* | Silence Minitest for plugin tests.Guo Xiang Tan2014-12-022-1/+4
* | Merge pull request #17866 from bogdan/default-form-builderSantiago Pastorino2014-12-011-0/+39
|\ \
| * | Bugfix config.action_view.default_form_builder optionBogdan Gusiev2014-12-011-0/+39
* | | FIX: absolute_path may be nil for code added via instance_evalSam2014-12-011-1/+1
* | | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-asSean Griffin2014-11-291-0/+20
|\ \ \
| * | | Pure rack apps can be mounted with a nameJean Boussier2014-11-291-0/+20
| |/ /
* | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-2911-23/+19
* | | adds missing period in test.rb [ci skip]Xavier Noria2014-11-291-1/+1
* | | Bump required Ruby version to 2.1.0claudiob2014-11-282-4/+4
* | | 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-282-211/+4
|/ /
* | docs, AR no longer makes use of `test:prepare`. [ci skip]Yves Senn2014-11-281-1/+2
* | Revert "Test against rack master"Santiago Pastorino2014-11-271-2/+2
* | 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 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 rootAlexander Mankuta2014-11-261-1/+1
* | | 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 releaseGenadi Samokovarov2014-11-261-1/+1
* | | Generators add foreign keys on referencesDerek Prior2014-11-253-1/+51
* | | 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
* | bring back `db:test:prepare`.Yves Senn2014-11-252-9/+92
* | tests, run `test_test.rb` with `RAILS_ENV=test`.Yves Senn2014-11-251-1/+1
* | Added tests for log_level deprecationGodfrey Chan2014-11-251-13/+18
* | Set the test_order in the basic app as well, see 58e8b48Godfrey Chan2014-11-252-0/+26
* | Set the default log_level to info in all testsGodfrey Chan2014-11-251-0/+1
* | Merge pull request #17757 from zzak/railties-default-to-debug-log_levelGodfrey Chan2014-11-251-0/+1
|\ \
| * | 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]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
|\ \
| * | Removing unnecessary File.join callsAndy Jeffries2014-11-241-1/+1
| * | Creates an ApplicationMailer and layout by default, including html and body t...Andy Jeffries2014-11-215-10/+48
* | | Fix sprockets-rails dependency danceArthur Neves2014-11-241-2/+0
| |/ |/|
* | Merge pull request #17737 from yui-knk/fix/headSantiago Pastorino2014-11-241-2/+2
|\ \
| * | Replace ActionDispatch::Head with Rack::Head.yui-knk2014-11-241-2/+2
* | | Fix wrong path in comments about stylesheetsRichard Littauer2014-11-241-1/+1