aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* On larger screens the email preview iframe is being limited to a height of 80...Edwin Wills2014-10-291-1/+4
* Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\
| * Added 'tzinfo-data' if we are using jrubyLuca Simone2014-10-291-2/+2
* | edit pass over all warningsXavier Noria2014-10-281-1/+1
|/
* Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\
| * Fix rbx generated Gemfile regexBenjamin Fleischer2014-10-271-1/+1
* | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errorsAndrew White2014-10-271-0/+15
|\ \ | |/ |/|
| * UrlGenerationError are not catched as 404 anymoreJean Boussier2014-10-271-0/+15
* | Add back --skip-turbolinks and remove --skip-gemsRafael Mendonça França2014-10-263-16/+12
|/
* :nail_care: it's -> its (see comments on 9a586ac)Godfrey Chan2014-10-181-1/+1
* [ci skip] A Rails engine is not a man :ok_woman:Zachary Scott2014-10-181-1/+1
* Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster...Rafael Mendonça França2014-10-182-4/+4
* Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-182-4/+4
* Replace (slower) block.call with (faster) yieldclaudiob2014-10-182-4/+4
* Merge pull request #17292 from tricknotes/generator-test-docRafael Mendonça França2014-10-161-1/+1
|\
| * Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]Ryunosuke SATO2014-10-171-1/+1
* | Use released rails-dom-testingRafael Mendonça França2014-10-161-2/+0
|/
* test, `Generators::GeneratedAttribute` with references, required, index.Yves Senn2014-10-161-0/+8
* Merge pull request #17278 from velobuff/clarify-debugger-invocationYves Senn2014-10-161-1/+2
|\
| * clarify debugger platform invocationRaman Sinha2014-10-151-1/+2
* | some changelog formatting. [ci skip]Yves Senn2014-10-161-1/+1
* | Merge pull request #17280 from aditya-kapoor/remove-unneeded-fileYves Senn2014-10-161-9/+0
|\ \
| * | remove unneeded fileAditya Kapoor2014-10-161-9/+0
| |/
* / use require_command! instead of calling its definitionAditya Kapoor2014-10-161-1/+1
|/
* Don't need to account turbolinks cookies in get request.Rafael Mendonça França2014-10-131-6/+6
* Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-pluginRafael Mendonça França2014-10-132-0/+7
|\
| * fix test_helper for mountable pluginmasarakki2014-10-132-0/+7
* | Replace Enumerable#reverse.each with Enumerable#reverse_eachErik Michaels-Ober2014-10-131-1/+1
* | Default generated Gemfile to coffee-rails ~> 4.1.0Joshua Peek2014-10-121-2/+2
|/
* Merge pull request #17088 from robin850/jruby-devRafael Mendonça França2014-10-011-0/+1
|\
| * Follow up to #16613Robin Dupret2014-09-281-0/+1
* | Generate the application pointing to rails-dom-testing masterRafael Mendonça França2014-09-301-0/+2
* | correct filename for jobs testsAbdelkader Boudih2014-09-281-1/+1
* | Merge pull request #17077 from schneems/schneems/backtrace-string-allocationsJeremy Kemper2014-09-271-4/+9
|\ \ | |/ |/|
| * Move object allocation out of loopRichard Schneeman2014-09-271-4/+9
* | Preparing for 4.2.0.beta2 releaseRafael Mendonça França2014-09-261-1/+1
* | remove extra # in cssByron Bischoff2014-09-251-1/+1
* | rails-html-sanitizer is now the defaultRafael Mendonça França2014-09-251-3/+0
* | Remove unused codeRafael Mendonça França2014-09-252-23/+1
* | :nail_care: the CSSRafael Mendonça França2014-09-251-7/+18
* | Merge pull request #17024 from buddhamagnet/amend-welcome-pageRafael Mendonça França2014-09-252-14/+11
|\ \
| * | Improve welcome page css and table cell aignments.buddhamagnet2014-09-252-14/+11
* | | Use released rails-html-sanitizer and rails-deprecated_sanitizerGodfrey Chan2014-09-261-1/+1
* | | Use release web-consoleRafael Mendonça França2014-09-251-1/+1
* | | Remove --skip-action-view option from application generatorDan Olson2014-09-245-11/+9
* | | Fix loading fixtures in engine testsGrzesiek Kolodziejczyk2014-09-231-1/+1
|/ /
* / Fix another false assertionsYuki Nishijima2014-09-211-1/+1
|/
* Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-221-5/+1
|\
| * Document that the default for `rails server -b` has changedGodfrey Chan2014-09-221-5/+1
* | Standardize on `Rails.application` [ci skip]Tamir Duberstein2014-09-192-2/+2
|/