aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Make the config actually copyableGodfrey Chan2014-10-141-1/+1
| | | | | | | | | | | | | | | | | | The intention here is to make the required config copy-able from the console/logs, so add a newline at the end of the message to make that easier. (Otherwise it would be `... raise_in_transactional_callbacks = true (called from...`.)
* | | | | | :scissors: duplicated `require`sGodfrey Chan2014-10-141-1/+0
| | | | | |
* | | | | | make sure cache is not used for collection assocations tooAaron Patterson2014-10-143-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | follow up for #17052
* | | | | | break cache if we're inside a "scoping" call. fixes #17052Aaron Patterson2014-10-142-1/+16
| |/ / / / |/| | | | | | | | | | | | | | | | | | | For now, we don't want to take "scoping" calls in to account when calculating cache keys for relations, so just opt-out.
* | | | | Merge pull request #17220 from Bounga/fix_journey_rfc_3986_complianceAndrew White2014-10-143-11/+34
|\ \ \ \ \ | |_|/ / / |/| | | | Improve Journey compliance to RFC 3986
| * | | | Improve Journey compliance to RFC 3986Nicolas Cavigneaux2014-10-143-11/+34
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scanner in Journey fails to recognize routes that use literals from the sub-delims section of RFC 3986. This commit enhance the compatibility of Journey with the RFC by adding support of authorized delimiters to the scanner. Fix #17212
* | | | Merge pull request #17253 from gshutler/activemodel-errors-keyRafael Mendonça França2014-10-142-0/+13
|\ \ \ \ | | | | | | | | | | Add #key? to ActiveModel::Errors
| * | | | Add #key? to ActiveModel::ErrorsGarry Shutler2014-10-142-0/+13
| | | | | | | | | | | | | | | | | | | | Mirror Ruby's Hash#key?
* | | | | Merge pull request #17252 from Bounga/update_all_doc_clarificationSean Griffin2014-10-141-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Clarify `#update_all` doc about values processing
| * | | | Clarify `#update_all` doc about value processingNicolas Cavigneaux2014-10-141-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This clarify the fact that `#update_all` doesn't type-cast passed values and that these values are written as-is in the SQL DB. Fix #17242 [ci skip]
* | | | Merge pull request #17251 from claudiob/remove-duplicate-exceptionRafael Mendonça França2014-10-131-6/+10
|\ \ \ \ | | | | | | | | | | Remove duplicate error message "Couldn't find..."
| * | | | Remove duplicate error message "Couldn't find..."claudiob2014-10-131-6/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the duplication of the error message: > Couldn't find #{@klass.name} with [#{arel.where_sql}] introduced in #15791 by adding a private method `find_nth!` that deals with all the method like `first!` and `second!`.
* | | | measure record instantiation time in AS::NotificationsAaron Patterson2014-10-133-4/+58
| | | | | | | | | | | | | | | | | | | | emit an event when we instantiate AR objects so we can see how many records were instantiated and how long it took
* | | | Always use latest turbolinksRafael Mendonça França2014-10-131-1/+1
| | | |
* | | | Don't need to account turbolinks cookies in get request.Rafael Mendonça França2014-10-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was changed to not set the cookie in get requests at https://github.com/rails/turbolinks/commit/62cc3db457ad9745ccda047dd43ab84fb3d89707. Related with dcb05f26.
* | | | add length to ActiveRecord::ResultAaron Patterson2014-10-132-0/+8
| | | |
* | | | Merge pull request #17232 from Agis-/issue-17209Rafael Mendonça França2014-10-134-1/+28
|\ \ \ \ | | | | | | | | | | Autosave callbacks shouldn't be `after_save` callbacks
| * | | | Autosave callbacks shouldn't be `after_save`Agis-2014-10-134-1/+28
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 068f092ced8483e557725542dd919ab7c516e567 registered autosave callbacks as `after_save` callbacks. This caused the regression described in #17209. Autosave callbacks should be registered as `after_update` and `after_create` callbacks, just like before. This is a partial revert of 068f092ced8483e557725542dd919ab7c516e567. Fixes #17209.
* | | | line_statistics is not an executableRafael Mendonça França2014-10-132-2/+2
| | | | | | | | | | | | | | | | Also add documentation on it
* | | | Make a note about the internal tools/ dir and what each utility doesJeremy Kemper2014-10-131-0/+8
| | | |
* | | | Do not use deprecated `exists?` methodRafael Mendonça França2014-10-131-1/+1
| | | |
* | | | Document the propose of tools/profileRafael Mendonça França2014-10-131-0/+3
| | | |
* | | | Revert "Merge pull request #17247 from igas/fix-deprecations"Rafael Mendonça França2014-10-131-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/masterRafael Mendonça França2014-10-131-1/+1
|\ \ \ \ | | | | | | | | | | atomic_write rescue also Errno::EACCES
| * | | | atomic_write rescue also Errno::EACCESRoberto Zanon2014-10-101-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-deprecationsRafael Mendonça França2014-10-131-133/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove unused tools/profile We usually use moderns tools like benchmark-ips so we don't need this anymore
| * | | | | remove unused tools/profileIgor Kapkov2014-10-131-133/+0
| | | | | |
* | | | | | 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 plugin
| * | | | | fix test_helper for mountable pluginmasarakki2014-10-132-0/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #17234 from arthurnn/add_regression_for_path_and_cascadeRafael Mendonça França2014-10-131-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Add regression test for router was overwriting PATH_INFO
| * | | | | Add regression test for router was overwriting PATH_INFOArthur Neves2014-10-101-0/+8
| |/ / / / | | | | | | | | | | | | | | | [related #17233]
* | | | | Merge pull request #17246 from sferik/railties_firstRafael Mendonça França2014-10-131-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Start running railties builds first, since they take the longest finish
| * | | | | Start running railties builds first, since they take the longest finishErik Michaels-Ober2014-10-131-7/+7
| | | | | |
* | | | | | Merge pull request #17245 from sferik/sampleXavier Noria2014-10-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace Array#shuffle.first with Array#sample
| * | | | | | Replace Array#shuffle.first with Array#sampleErik Michaels-Ober2014-10-131-2/+2
| |/ / / / /
* | | | | | Merge pull request #17244 from sferik/reverse_eachXavier Noria2014-10-135-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Replace Enumerable#reverse.each with Enumerable#reverse_each
| * | | | | Replace Enumerable#reverse.each with Enumerable#reverse_eachErik Michaels-Ober2014-10-135-6/+6
|/ / / / /
* | | | | Merge pull request #17241 from josh/coffee-rails-4-1Guillermo Iguaran2014-10-122-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Upgrade to coffee-rails 4.1.0
| * | | | Default generated Gemfile to coffee-rails ~> 4.1.0Joshua Peek2014-10-122-3/+3
|/ / / /
* | | | Merge pull request #17014 from grosser/grosser/fast-fixturesAaron Patterson2014-10-103-66/+2
|\ \ \ \ | |/ / / |/| | | speed up fixtures by not loading all their classes
| * | | speed up fixtures by not loading all their classesgrosser2014-10-063-66/+2
| | | |
* | | | tests, move `original_` var assignments outside of `begin`.Yves Senn2014-10-102-11/+16
| | | |
* | | | Merge pull request #17223 from bgentry/active-job-empty-queue-nameYves Senn2014-10-102-1/+21
|\ \ \ \ | |_|/ / |/| | | ActiveJob: allow empty queue names
| * | | ActiveJob: allow blank queue namesBlake Gentry2014-10-092-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-messageRafael Mendonça França2014-10-092-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 localeStefan Henzen2014-10-092-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_linkAbdelkader Boudih2014-10-091-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 Sharma2014-10-091-9/+6
|/ / / | | | | | | | | | “gems” instead of plugins
* | | Merge pull request #17215 from aripollak/sidekiq-no-retry-optionRafael Mendonça França2014-10-081-3/+1
|\ \ \ | | | | | | | | Don't pass retry option to Sidekiq
| * | | Don't pass retry option to SidekiqAri Pollak2014-10-081-3/+1
|/ / / | | | | | | | | | | | | * This would override whatever default is configured in Sidekiq system-wide, and retry is true by default anyway.