Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Do not use deprecated `exists?` method | Rafael Mendonça França | 2014-10-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | Document the propose of tools/profile | Rafael Mendonça França | 2014-10-13 | 1 | -0/+3 | |
| | | | ||||||
* | | | Revert "Merge pull request #17247 from igas/fix-deprecations" | Rafael Mendonça França | 2014-10-13 | 1 | -0/+133 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 997f1575f78bf6a2d12b8665a55807d51fe964df, reversing changes made to f919d5f5ea75f0e56a57643e5a0472367a98625f. See https://github.com/rails/rails/pull/17247#issuecomment-58895078 | |||||
* | | | Merge pull request #17230 from robertoz-01/master | Rafael Mendonça França | 2014-10-13 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | atomic_write rescue also Errno::EACCES | |||||
| * | | | atomic_write rescue also Errno::EACCES | Roberto Zanon | 2014-10-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | atomic_write rescue also Errno::EACCES on changing file permission. It could be raised with some type of filesystem | |||||
* | | | | Merge pull request #17247 from igas/fix-deprecations | Rafael Mendonça França | 2014-10-13 | 1 | -133/+0 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | remove unused tools/profile We usually use moderns tools like benchmark-ips so we don't need this anymore | |||||
| * | | | | remove unused tools/profile | Igor Kapkov | 2014-10-13 | 1 | -133/+0 | |
| | | | | | ||||||
* | | | | | Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-plugin | Rafael Mendonça França | 2014-10-13 | 2 | -0/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix test_helper for mountable plugin | |||||
| * | | | | fix test_helper for mountable plugin | masarakki | 2014-10-13 | 2 | -0/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #17234 from arthurnn/add_regression_for_path_and_cascade | Rafael Mendonça França | 2014-10-13 | 1 | -0/+8 | |
|\ \ \ \ | | | | | | | | | | | Add regression test for router was overwriting PATH_INFO | |||||
| * | | | | Add regression test for router was overwriting PATH_INFO | Arthur Neves | 2014-10-10 | 1 | -0/+8 | |
| |/ / / | | | | | | | | | | | | | [related #17233] | |||||
* | | | | Merge pull request #17246 from sferik/railties_first | Rafael Mendonça França | 2014-10-13 | 1 | -7/+7 | |
|\ \ \ \ | | | | | | | | | | | Start running railties builds first, since they take the longest finish | |||||
| * | | | | Start running railties builds first, since they take the longest finish | Erik Michaels-Ober | 2014-10-13 | 1 | -7/+7 | |
| | | | | | ||||||
* | | | | | Merge pull request #17245 from sferik/sample | Xavier Noria | 2014-10-13 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Replace Array#shuffle.first with Array#sample | |||||
| * | | | | | Replace Array#shuffle.first with Array#sample | Erik Michaels-Ober | 2014-10-13 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #17244 from sferik/reverse_each | Xavier Noria | 2014-10-13 | 5 | -6/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Replace Enumerable#reverse.each with Enumerable#reverse_each | |||||
| * | | | | Replace Enumerable#reverse.each with Enumerable#reverse_each | Erik Michaels-Ober | 2014-10-13 | 5 | -6/+6 | |
|/ / / / | ||||||
* | | | | Merge pull request #17241 from josh/coffee-rails-4-1 | Guillermo Iguaran | 2014-10-12 | 2 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Upgrade to coffee-rails 4.1.0 | |||||
| * | | | Default generated Gemfile to coffee-rails ~> 4.1.0 | Joshua Peek | 2014-10-12 | 2 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #17014 from grosser/grosser/fast-fixtures | Aaron Patterson | 2014-10-10 | 3 | -66/+2 | |
|\ \ \ | |/ / |/| | | speed up fixtures by not loading all their classes | |||||
| * | | speed up fixtures by not loading all their classes | grosser | 2014-10-06 | 3 | -66/+2 | |
| | | | ||||||
* | | | tests, move `original_` var assignments outside of `begin`. | Yves Senn | 2014-10-10 | 2 | -11/+16 | |
| | | | ||||||
* | | | Merge pull request #17223 from bgentry/active-job-empty-queue-name | Yves Senn | 2014-10-10 | 2 | -1/+21 | |
|\ \ \ | |_|/ |/| | | ActiveJob: allow empty queue names | |||||
| * | | ActiveJob: allow blank queue names | Blake Gentry | 2014-10-09 | 2 | -1/+21 | |
|/ / | | | | | | | | | | | | | As discussed in #17195, Que uses blank queue names by default for performance reasons. At the very least, ActiveJob should allow users to choose "" as their queue name. This commit allows blank queue names, as well as tests to make sure that nil queue names still use the default. | |||||
* | | Merge pull request #17221 from StefanH/fix-unknown-http-method-message | Rafael Mendonça França | 2014-10-09 | 2 | -1/+17 | |
|\ \ | | | | | | | Invalid HTTP method will raise I18n::InvalidLocale if :en is not a valid locale. | |||||
| * | | Request#check_method no longer breaks when :en is not available locale | Stefan Henzen | 2014-10-09 | 2 | -1/+17 | |
|/ / | | | | | | | | | | | | | | | Request#check_method would use to_sentence(locale: :en), which breaks when I18n.available_locales does not include :en and I18n.enforce_available_locales is true (default). Inlined to_sentence functionality to solve this. | |||||
* | | Merge pull request #17219 from Gaurav2728/gaurav-missing_i18_link | Abdelkader Boudih | 2014-10-09 | 1 | -9/+6 | |
|\ \ | | | | | | | [ci skip] removing ruby-i18n.org/wiki link that is not available and usi... | |||||
| * | | [ci skip] removing ruby-i18n.org/wiki link that is not available and using ↵ | Gaurav Sharma | 2014-10-09 | 1 | -9/+6 | |
|/ / | | | | | | | “gems” instead of plugins | |||||
* | | Merge pull request #17215 from aripollak/sidekiq-no-retry-option | Rafael Mendonça França | 2014-10-08 | 1 | -3/+1 | |
|\ \ | | | | | | | Don't pass retry option to Sidekiq | |||||
| * | | Don't pass retry option to Sidekiq | Ari Pollak | 2014-10-08 | 1 | -3/+1 | |
|/ / | | | | | | | | | * This would override whatever default is configured in Sidekiq system-wide, and retry is true by default anyway. | |||||
* | | Point to a specific version of guide to make the redirect work | Rafael Mendonça França | 2014-10-08 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #17205 from y-yagi/patch-1 | Abdelkader Boudih | 2014-10-08 | 1 | -1/+1 | |
|\ \ | | | | | | | update error message when InlineAdapter is used | |||||
| * | | update error message when InlineAdapter is used | yuuji.yaginuma | 2014-10-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #17187 from Bounga/middleware_reloading_explaination | Abdelkader Boudih | 2014-10-08 | 1 | -0/+4 | |
|\ \ \ | |/ / |/| | | Warning about middleware not auto-reloading | |||||
| * | | Warning about middleware not auto-reloading | Nicolas Cavigneaux | 2014-10-08 | 1 | -0/+4 | |
|/ / | | | | | | | | | | | | | | | | | Add a section in the guide to explain that Rails can't auto-reload a middleware on code change. Fix #16806 [ci skip] | |||||
* | | Only include the needed assertions | Rafael Mendonça França | 2014-10-07 | 2 | -2/+3 | |
| | | ||||||
* | | Merge pull request #17204 from schneems/schneems/fix-am-tests-master | Rafael Mendonça França | 2014-10-07 | 4 | -7/+9 | |
|\ \ | | | | | | | | | | fix tests on action_mailer | |||||
| * | | fix tests on action_mailer | schneems | 2014-10-07 | 4 | -7/+9 | |
| | | | | | | | | | Include appropriate helpers and use `assert_dom_equal` where applicable | |||||
* | | | Merge pull request #17203 from schneems/schneems/av-tag_helper | Rafael Mendonça França | 2014-10-07 | 3 | -10/+9 | |
|\| | | | | | | | | remove un-needed sort | |||||
| * | | remove un-needed sort | schneems | 2014-10-07 | 3 | -10/+9 | |
|/ / | | | | | | | | | | | HTML doesn't care what order the elements are rendered in, so why should we? Updates tests to use proper `assert_dom_equal` instead of `assert_equal` /cc @jeremy | |||||
* | | Merge pull request #17201 from djpowers/patch-1 | Abdelkader Boudih | 2014-10-07 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix grammar [ci skip] | |||||
| * | | Fix grammar | Dave Powers | 2014-10-07 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #17198 from neerajdotname/wordsmitthing | Rafael Mendonça França | 2014-10-07 | 1 | -2/+2 | |
|\ \ | | | | | | | Rephrasing sentences | |||||
| * | | Rephrasing sentences | Neeraj Singh | 2014-10-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #17184 from fillman/master | Rafael Mendonça França | 2014-10-07 | 1 | -6/+17 | |
|\ \ \ | | | | | | | | | fix autoload tests | |||||
| * | | | fix autoload tests | fillman | 2014-10-05 | 1 | -6/+17 | |
| | | | | ||||||
* | | | | Merge pull request #17146 from divineforest/active-record-gsub-to-tr | Rafael Mendonça França | 2014-10-07 | 4 | -4/+4 | |
|\ \ \ \ | |_|/ / |/| | | | Change `gsub` to `tr` where possible | |||||
| * | | | Change `gsub` to `tr` where possible | Alexander Balashov | 2014-10-06 | 4 | -4/+4 | |
| | | | | ||||||
* | | | | Merge pull request #17189 from jipiboily/update-queue-classic-details | Zachary Scott | 2014-10-06 | 2 | -7/+7 | |
|\ \ \ \ | | | | | | | | | | | update queue_classic details [ci skip] | |||||
| * | | | | update queue_classic details | Jean-Philippe Boily | 2014-10-06 | 2 | -7/+7 | |
|/ / / / |