aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Copy-edit the parent commitRafael Mendonça França2013-12-121-6/+8
| | | | |
* | | | | Merge pull request #13268 from aayushkhandelwal11/masterRafael Mendonça França2013-12-121-22/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Moving the common code of increment and decrement of cache file store in...
| * | | | | Moving the common code of increment and decrement of cache file store into ↵Aayush khandelwal2013-12-121-22/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seprate function Removing the double checking for the value of id simplifying code for checking conditional code for key Removing the default values for parameters removing reduntant code and asiigning value of id in local variable removing wrongly added line break[ci ckip] reverting code
* | | | | Merge pull request #13290 from strzalek/inline-syntax-docsRafael Mendonça França2013-12-123-0/+27
|\ \ \ \ \ | | | | | | | | | | | | Variants inline syntax documentation
| * | | | | Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-123-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extend method documentation * Mention it in actionpack/CHANGELOG * Update release notes
* | | | | | Merge pull request #13291 from strzibny/new_unique_constraintYves Senn2013-12-121-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Translate new unique constraint error message for sqlite >= 3.8.2
| * | | | | Translate new unique constraint for sqlite >= 3.8.2Josef Stribny2013-12-121-1/+5
| | | | | |
* | | | | | Merge pull request #13032 from kuldeepaggarwal/after_touch_documentationYves Senn2013-12-121-0/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] added after_touch callback documentation [ci skip]
| * | | | | | [ci skip] added after_touch callback documentationKuldeep Aggarwal2013-12-121-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] added more explanation for `after_touch` callback
* | | | | | | Get rid of hack for freezing time on AR testsCarlos Antonio da Silva2013-12-122-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now make use of the existent #travel/#travel_to helper methods added to AS test case and available in all tests.
* | | | | | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-123-12/+14
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in action_controller responder.rb [ci skip]
| * | | | | | Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #13287 from aayushkhandelwal11/typo_rectifiedYves Senn2013-12-113-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | typos rectified lifecycle => life cycle
| * | | | | | | typos rectified lifecycle => life cycleAayush khandelwal2013-12-123-5/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | JSON: speed up date/time encodingJeremy Kemper2013-12-111-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing dates & times with other objects using #== is slow. Internally, it hits #<=> which calls #to_datetime on objects that don't respond to it, so we incur the cost of raising an exception with a possibly-deep backtrace. Cost of #jsonify on a Time object: Calculating ------------------------------------- old 3644 i/100ms new 12652 i/100ms ------------------------------------------------- old 43373.8 (±3.5%) i/s - 218640 in 5.047017s new 173437.6 (±5.2%) i/s - 872988 in 5.047747s
* | | | | | | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-113-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | s/everytime/every time/
| * | | | | | typos rectified [ci skip]Aayush khandelwal2013-12-123-3/+3
| |/ / / / /
* | | | | | Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetchRafael Mendonça França2013-12-113-14/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetch
| * | | | | | Update CHANGELOG entry for Session#fetchTrent Ogren2013-12-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the changes to CHANGELOG.md in commit 38f8872aa5fd8f0a1d0895e9eb41f73261acd040.
| * | | | | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-112-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Session#fetch was mutating the session when given a default argument and/or a block. Since Session duck-types as a Hash, it should behave like one in these cases.
* | | | | | | Merge pull request #13281 from waynn/patch-5Rafael Mendonça França2013-12-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | test description uses "disable" when it should be "disabled"
| * | | | | | | test description uses "disable" when it should be "disabled"Waynn Lue2013-12-111-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #13280 from waynn/patch-4Rafael Mendonça França2013-12-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | value is "disabled" not "disable"
| * | | | | | | value is "disabled" not "disable"Waynn Lue2013-12-111-1/+1
| | | | | | | |
* | | | | | | | Remove not necessary file, move constants to the file they are usedCarlos Antonio da Silva2013-12-113-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File 'empty_bool.rb' was introduced around 4 years ago in c10958fbddb22052e7cbe5fe6b825cda3cb26e48 to remove method redefined warning in AS test suite, however we do not have such need for reuse anymore, so we can safely move the constants back to the file where they are currently used and get rid of the extra file/require.
* | | | | | | | Merge pull request #13264 from ↵Rafael Mendonça França2013-12-113-2/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | laurocaetano/fix_dynamic_finder_with_reserved_words Prevent invalid code when using dynamic finders with reserved ruby word.
| * | | | | | | Prevent invalid code when using dynamic finders with Ruby's reserved words.Lauro Caetano2013-12-113-2/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dynamic finder was creating the method signature with the parameters name, which may have reserved words and this way creating invalid Ruby code. Closes: #13261 Example: # Before Dog.find_by_alias('dog name') # Was creating this method def self.find_by_alias(alias, options = {}) # After Dog.find_by_alias('dog name') # Will create this method def self.find_by_alias(_alias, options = {})
* | | | | | | Merge branch 'support-deprecated-finders'Rafael Mendonça França2013-12-118-48/+66
|\ \ \ \ \ \ \
| * | | | | | | Move the parameter normalization to the initialize methodRafael Mendonça França2013-12-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activerecord-deprecated_finders expects the parameters denormalized in its initialize method
| * | | | | | | Revert the whole refactoring in the association builder classes.Rafael Mendonça França2013-12-118-47/+64
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | This is to get activerecord-deprecated_finders work again
* / | | | | | Nodoc missing number helper classes in AS [ci skip]Carlos Antonio da Silva2013-12-113-4/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | These classes are not meant to be public.
* | | | | | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"Rafael Mendonça França2013-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will call primary_key two times This reverts commit d0588a2e897d33c6c12e9fc5f8680328d37a26ca, reversing changes made to 87e1e86640fb8b5a260ff7c0044aaae58fff2bc4.
* | | | | | Mark the arguments needed by activerecord-deprecated_finders with a TODORafael Mendonça França2013-12-114-2/+20
| | | | | |
* | | | | | Revert "Merge pull request #12518 from vipulnsward/remove_count_options"Rafael Mendonça França2013-12-115-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed for activerecord-depecated_finders This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f.
* | | | | | Bring back the valid_options class accessorRafael Mendonça França2013-12-116-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | It is need in activerecord-deprecated_finders
* | | | | | Merge pull request #13276 from aayushkhandelwal11/change_to_keyRafael Mendonça França2013-12-111-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | removing multiple check conditions to single check condition
| * | | | | | removing multiple check conditions to single check conditionAayush khandelwal2013-12-111-2/+1
| |/ / / / /
* | | | | | Merge pull request #13273 from robertomiranda/test-remove-requireGuillermo Iguaran2013-12-111-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove require 'models/administrator', Administrator is not used in secure password test
| * | | | | | Remove require 'models/administrator', Administrator is not used in secure ↵robertomiranda2013-12-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | password test
* | | | | | | Merge pull request #13270 from aayushkhandelwal11/typosDamien Mathieu2013-12-112-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | typo rectified
| * | | | | | typo rectified [skip ci]Aayush khandelwal2013-12-112-2/+2
|/ / / / / /
* | | | | | Merge pull request #13260 from arunagw/using-parallelize_meAaron Patterson2013-12-101-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Using parallelize_me! to parallelize isolated test
| * | | | | | Using parallelize_me! to parallelize isolated testArun Agrawal2013-12-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As ParallelEach is no more available related commit ec00442c10cb90796909e876fb1cc557ed7518bd
* | | | | | | Merge pull request #12699 from drogus/fix-mounting-engine-in-resourcesPiotr Sarnacki2013-12-103-2/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix mounting engines inside a resources block
| * | | | | | | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a route is mounted inside a resources block, it's automatically prefixed, so a following code: resources :users do mount Blog::Engine => '/blog' end will generate a user_blog path helper. In order to access engine helpers, we also use "mounted_helpers", a list of helpers associated with each mounted engine, so a path to blog's post can be generated using user_blog.post_path(user, post). The problem I'm fixing here is that mount used a raw :as option, without taking nestings into account. As a result, blog was added to a route set as a `user_blog`, but helper was generated for just `blog`. This commit applies the proper logic for defining a helper for a mounted engine nested in resources or resource block. (closes #8533)
* | | | | | | Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2. Reverting this for now until we fix the Thor related issue
* | | | | | | Merge pull request #13258 from semaperepelitsa/docsDamien Mathieu2013-12-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in docs, missing colon in Symbol literal
| * | | | | | | Fix typo in docs, missing colon in Symbol literal [ci skip]Semyon Perepelitsa2013-12-111-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #13257 from eshira/optimize-gsubJosé Valim2013-12-101-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace with gsub! in ActiveSupport::Inflector