Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17257 from Bounga/use_tr_instead_of_gsub_in_journey_scanner | Santiago Pastorino | 2014-10-15 | 1 | -1/+1 |
|\ | | | | | Use `#tr` instead of `#gsub` in Journey scanner | ||||
| * | Use `#tr` instead of `#gsub` | Nicolas Cavigneaux | 2014-10-14 | 1 | -1/+1 |
| | | | | | | | | | | `#tr` is more efficient than `#gsub` and can be used as a drop in replacement in this context. | ||||
* | | Merge pull request #17264 from claudiob/add-activejob-to-readme | Rafael Mendonça França | 2014-10-15 | 1 | -3/+5 |
|\ \ | | | | | | | Add ActiveJob to "Welcome to Rails" section | ||||
| * | | Add ActiveJob to "Welcome to Rails" section | claudiob | 2014-10-15 | 1 | -3/+5 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #17265 from claudiob/add-link-to-active-model-readme | Rafael Mendonça França | 2014-10-15 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Link to ActiveModel’s README in "Welcome to Rails" | ||||
| * | | | Link to ActiveModel’s README in "Welcome to Rails" | claudiob | 2014-10-15 | 1 | -4/+4 |
| |/ / | | | | | | | | | | | | | | | | | | | A link to the README of each module is included in "Welcome to Rails", only ActiveModel (and ActiveJob, see #17264) are missing. [ci skip] | ||||
* | | | Merge pull request #17266 from claudiob/fix-broken-tore-darell-link | Rafael Mendonça França | 2014-10-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove broken http://tore.darell.no link | ||||
| * | | | Remove broken http://tore.darell.no link | claudiob | 2014-10-15 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | Replace with Twitter account, unless @toretore has a better suggestion :ear since http://tore.darell.no returns 404. [ci skip] | ||||
* | | | Merge pull request #17270 from neumanrq/fix/external_links_to_json_project | Rafael Mendonça França | 2014-10-15 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | specify protocol for external links to json project | ||||
| * | | | specify protocol for external links | Robin Neumann | 2014-10-15 | 2 | -2/+2 |
|/ / / | | | | | | | | | | to ensure correct parsing result of rdoc | ||||
* | | | Make the config actually copyable | Godfrey Chan | 2014-10-14 | 1 | -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`s | Godfrey Chan | 2014-10-14 | 1 | -1/+0 |
| | | | |||||
* | | | make sure cache is not used for collection assocations too | Aaron Patterson | 2014-10-14 | 3 | -2/+19 |
| | | | | | | | | | | | | follow up for #17052 | ||||
* | | | break cache if we're inside a "scoping" call. fixes #17052 | Aaron Patterson | 2014-10-14 | 2 | -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_compliance | Andrew White | 2014-10-14 | 3 | -11/+34 |
|\ \ | | | | | | | Improve Journey compliance to RFC 3986 | ||||
| * | | Improve Journey compliance to RFC 3986 | Nicolas Cavigneaux | 2014-10-14 | 3 | -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-key | Rafael Mendonça França | 2014-10-14 | 2 | -0/+13 |
|\ \ | | | | | | | Add #key? to ActiveModel::Errors | ||||
| * | | Add #key? to ActiveModel::Errors | Garry Shutler | 2014-10-14 | 2 | -0/+13 |
| | | | | | | | | | | | | Mirror Ruby's Hash#key? | ||||
* | | | Merge pull request #17252 from Bounga/update_all_doc_clarification | Sean Griffin | 2014-10-14 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | [ci skip] Clarify `#update_all` doc about values processing | ||||
| * | | Clarify `#update_all` doc about value processing | Nicolas Cavigneaux | 2014-10-14 | 1 | -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-exception | Rafael Mendonça França | 2014-10-13 | 1 | -6/+10 |
|\ \ | | | | | | | Remove duplicate error message "Couldn't find..." | ||||
| * | | Remove duplicate error message "Couldn't find..." | claudiob | 2014-10-13 | 1 | -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::Notifications | Aaron Patterson | 2014-10-13 | 3 | -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 turbolinks | Rafael Mendonça França | 2014-10-13 | 1 | -1/+1 |
| | | |||||
* | | Don't need to account turbolinks cookies in get request. | Rafael Mendonça França | 2014-10-13 | 1 | -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::Result | Aaron Patterson | 2014-10-13 | 2 | -0/+8 |
| | | |||||
* | | Merge pull request #17232 from Agis-/issue-17209 | Rafael Mendonça França | 2014-10-13 | 4 | -1/+28 |
|\ \ | | | | | | | Autosave callbacks shouldn't be `after_save` callbacks | ||||
| * | | Autosave callbacks shouldn't be `after_save` | Agis- | 2014-10-13 | 4 | -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 executable | Rafael Mendonça França | 2014-10-13 | 2 | -2/+2 |
| | | | | | | | | | | | | Also add documentation on it | ||||
* | | | Make a note about the internal tools/ dir and what each utility does | Jeremy Kemper | 2014-10-13 | 1 | -0/+8 |
| | | | |||||
* | | | 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 |