aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-116-2/+89
| | | | citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed.
* Merge pull request #14343 from garysweaver/masterVijay Dev2014-03-101-1/+1
|\ | | | | minor fix to 4.1 rel notes for begin_transaction joinable option
| * minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]Gary S. Weaver2014-03-101-1/+1
|/
* Merge pull request #8313 from alan/only_save_changed_has_one_objectsRafael Mendonça França2014-03-103-2/+24
|\ | | | | | | | | | | | | Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md
| * Save has_one associations only if record has changesAlan Kennedy2013-10-313-2/+24
| | | | | | | | | | | | Prevents save related callbacks such as `after_commit` being triggered when `has_one` objects are already persisted and have no changes.
* | current_adapter? accepts multiple argumentsRafael Mendonça França2014-03-101-2/+2
| |
* | mysql adapter also fails with a number bigger than intRafael Mendonça França2014-03-101-2/+5
| |
* | The 4.1 release notes is already a thing so lets show in the guidesRafael Mendonça França2014-03-101-1/+0
| | | | | | | | links
* | Change the assertions depending in the database adapterRafael Mendonça França2014-03-101-14/+9
| | | | | | | | This will avoid the confusing flunk logic
* | Do proper adapter checkRafael Mendonça França2014-03-101-2/+2
| |
* | WhitespacesRafael Mendonça França2014-03-101-2/+2
| |
* | Merge pull request #14341 from keikun17/masterYves Senn2014-03-101-2/+2
|\ \ | | | | | | fix minor typo 'fields_for'. [ci skip]
| * | Fix 'fields_for' doc typo.Cakey | Buddy Magsipoc2014-03-101-2/+2
|/ /
* | Merge pull request #14332 from tgxworld/autosave_association_testYves Senn2014-03-101-7/+3
|\ \ | | | | | | Delete instances of Parrot after each test.
| * | Cleanup Parrot after each test.Guo Xiang Tan2014-03-091-7/+3
|/ /
* | Merge pull request #14334 from kennym/masterGodfrey Chan2014-03-091-4/+8
|\ \ | | | | | | Enhance readability of ActionView DateHelper#distance_of_time_in_words
| * | Enhance readability of ActionView DateHelper#distance_of_time_in_wordsKenny Meyer2014-03-091-4/+8
|/ / | | | | | | | | | | | | Refactor numerical constants to module constants which give the numbers a contextual meaning. This commit aims to provide quicker understanding for part of the implementation of the DateHelper#distance_of_time_in_words method.
* | Merge pull request #14315 from zuhao/activemodel_tests_in_random_orderYves Senn2014-03-094-13/+39
|\ \ | | | | | | Run ActiveModel test suites in random order.
| * | Run ActiveModel test suites in random order.Zuhao Wan2014-03-104-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets the whole ActiveModel test suites working even if `self.i_suck_and_my_tests_are_order_dependent!` is disabled in `ActiveSupport::TestCase`. Two places are found that potentially leak global state. This patch makes sure states are restored so that none of the changes happen in a single test will be carried over to subsequence tests.
* | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-0916-30/+30
|\ \ \ | | | | | | | | Replace additional instances of map.flatten with flat_map
| * | | Replace map.flatten with flat_map in railtiesErik Michaels-Ober2014-03-044-4/+4
| | | |
| * | | Replace map.flatten with flat_map in activerecordErik Michaels-Ober2014-03-035-8/+8
| | | |
| * | | Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
| | | |
* | | | Move changelog entry to the top, highlight module name [ci skip]Carlos Antonio da Silva2014-03-081-5/+6
| | | |
* | | | Copy shallow options from normal options when using scopeAndrew White2014-03-082-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set.
* | | | Pull namespace defaults out of the options hashAndrew White2014-03-082-3/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241.
* | | | Only use shallow nested scope when depth is > 1Andrew White2014-03-082-20/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224.
* | | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated.
* | | | Merge pull request #14313 from m-Peter/active_model_doc_fixesYves Senn2014-03-081-30/+49
|\ \ \ \ | | | | | | | | | | Fix errors for four of the code samples [ci skip]
| * | | | Fix errors for four of the code samplesPeter Markou2014-03-081-30/+49
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The four code samples that fail to run are: - Add attribute magic to objects. Fixed by introducing a Person instance variable. - Tracking value changes. Fixed by replacing `attr_accessor` with `define_attribute_methods`, providing getter and setter methods for `name` and providing the missing `Person#save` method. A call to `Person#save` has to precede the `person.name = 'robert'` assignment, if we want `previous_changes` to include 'bob'. - Adding `errors` interface to objects. Fixed by introducing a Person instance variable, assigning `nil` to its name and calling `Person#validate!`. - Custom validators. Fixed by defining `HasNameValidator` before it is used by `ValidatorPerson`. All the code samples can now be run smoothly. Call Dirty#changes_applied in Person#save, instead of modifying instance vars.
* | | | Merge pull request #14325 from robin850/issue-12133Santiago Pastorino2014-03-083-1/+18
|\ \ \ \ | | | | | | | | | | Make the rails:template rake task load initializers
| * | | | Make the rails:template rake task load initializersRobin Dupret2014-03-083-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133.
* | | | | Merge pull request #14244 from arthurnn/orderd_hash_select_fixSantiago Pastorino2014-03-082-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix OrderedHash.select to return self instance.
| * | | | | Fix OrderedHash.select to return self instance.Arthur Neves2014-03-072-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class.
* | | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-083-1/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Make CSRF failure logging optional/configurable.
| * | | | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default.
* | | | | | docs, shorten CsrfHelper description and refer to security guide. [ci skip]Yves Senn2014-03-081-8/+3
| | | | | |
* | | | | | added CSRF helper to rails guide documentation. Closes #11615. [ci skip]Yves Senn2014-03-081-3/+19
| | | | | |
* | | | | | Tests for indifferent access using full_messages_for. Closes #11916Pavel Penkov2014-03-081-0/+7
| | | | | |
* | | | | | Merge pull request #14318 from arthurnn/clean_preview_interceptorsAndrew White2014-03-071-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure we clean preview_interceptors
| * | | | | | Make sure we clean preview_interceptorsArthur Neves2014-03-071-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | We should make sure we clean preview_interceptors after each test so they dont leaky to the next test
* | | | | | Merge pull request #14316 from the4dpatrick/masterArthur Nogueira Neves2014-03-071-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add preventDefault() on click event
| * | | | | Add preventDefault() on click eventPatrick Perey2014-03-071-1/+3
|/ / / / /
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-078-22/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * | | | | fix typo app -> alldmathieu2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thank you @bquorning
| * | | | | unscope doesn't remove only the default_scope, but all of them.dmathieu2014-03-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip] Closes rails/rails#14294
| * | | | | Update doc for TagHelper.Hendy Tanata2014-03-051-2/+8
| | | | | |
| * | | | | Improve collision explanation for Hash#transform_keys.Hendy Tanata2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on comments at https://github.com/rails/docrails/commit/42417b0013819e573be9ffc5402e179003156e8e#commitcomment-5527251 [skip ci]
| * | | | | Fix code alignment in duplicable? guide.Hendy Tanata2014-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | Improve guide for Hash#transform_keys and related methods.Hendy Tanata2014-02-271-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:57:34 +0000