aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-164-6/+25
|\ | | | | | | | | | | | | Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
| * Collapse where constraints to one where constraintPaul Nikitochkin2013-09-134-6/+25
| | | | | | | | | | | | | | In order to remove duplication with joining arel where constraints with `AND`, all constraints on `build_arel` are collapsed into one head node: `Arel::Nodes::And` Closes: #11963
* | Merge pull request #12245 from kennyj/remove_no_using_code_20130916José Valim2013-09-161-4/+0
|\ \ | | | | | | Removes unused code related to DatabaseTasks.
| * | Removes unused code related to DatabaseTasks.kennyj2013-09-161-4/+0
|/ /
* | Merge pull request #12239 from JuanitoFatas/form_helpersSteve Klabnik2013-09-151-1/+1
|\ \ | | | | | | [ci skip] Consistency wording of 9.6 in form_helpers.md
| * | [ci skip] Consistency wording of 9.6 in form_helpers.mdJuanito Fatas2013-09-151-1/+1
|/ / | | | | | | | | | | Chapter 9 is giving a user and set of addresses example. So 'Add a new address' would be more consistent. Also change the javascript to JavaScript.
* | Merge pull request #12231 from harshadsabne/masterSteve Klabnik2013-09-141-6/+6
|\ \ | | | | | | [ci skip] Update plugins.md
| * | [ci skip] Update plugins.mdHarshad Sabne2013-09-141-6/+6
| | | | | | | | | Highlighted code.
* | | Merge pull request #12225 from adomokos/no_need_for_active_support_concernSteve Klabnik2013-09-131-2/+0
|\ \ \ | | | | | | | | Removing ActiveSupport::Concern, it's not needed
| * | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
|/ / /
* | | Merge pull request #12223 from adomokos/fixing_typoRafael Mendonça França2013-09-131-1/+1
|\ \ \ | | | | | | | | Fixing comment typo in ActionController::Base
| * | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
|/ / /
* | | Don't require using application_name before optionsPiotr Sarnacki2013-09-135-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit options for `rails new` and `rails plugin new` had to be passed in a strict order, trying to execute a following command: rails new -J path/to/app resulted in an error. This commit fixes the situation and allows to pass path to app anywhere after `new`
* | | Merge pull request #12222 from rcillo/fix-custom-flashRafael Mendonça França2013-09-133-1/+20
|\ \ \ | | | | | | | | | | | | | | | | Custom flash should be defined only for the class that defines it and it's subclasses Fixes #12057
| * | | Custom flash should be defined only for the class that defines it and it's ↵Ricardo de Cillo2013-09-133-1/+20
| | | | | | | | | | | | | | | | subclasses.
* | | | Merge pull request #12215 from harshadsabne/masterRafael Mendonça França2013-09-131-5/+5
|\ \ \ \ | | |/ / | |/| | Update 3_2_release_notes.md
| * | | Update 3_2_release_notes.mdHarshad Sabne2013-09-131-5/+5
| | | | | | | | | | | | Fixed typo and applied proper code highlighting.
* | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-139-11/+11
|\ \ \ \ | | | | | | | | | | Fix typos: the indefinite articles(a -> an).
| * | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-139-11/+11
| | | | |
* | | | | Missing destroy commandAkira Matsuda & Yukiko Kawamoto2013-09-131-0/+4
| |_|/ / |/| | |
* | | | Merge pull request #12129 from Empact/deprecate-array-bang-delegationRafael Mendonça França2013-09-125-147/+265
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the delegation of Array bang methods in ActiveRecord::Delegation Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/relation_test.rb
| * | | | Deprecate the delegation of Array bang methods in ActiveRecord::DelegationBen Woosley2013-09-043-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary means of returning results for Array bang methods is to modify the array in-place. When you call these methods on a relation, that array is created, modified, and then thrown away. Only the secondary return value is exposed to the caller. Removing this delegation is a straight-forward way to reduce user error by forcing callers to first explicitly call #to_a in order to expose the array to be acted on by the bang method.
| * | | | Pull the RelationMutationTests from cases/relation_test to ↵Ben Woosley2013-09-032-135/+139
| |/ / / | | | | | | | | | | | | cases/relation/mutation_test.
* | | | Merge pull request #12137 from lann/fix_association_first_lastRafael Mendonça França2013-09-123-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CollectionAssociation first/last with integer fetch with query Conflicts: activerecord/CHANGELOG.md
| * | | | Make CollectionAssociation first/last with integer fetch with queryLann Martin2013-09-093-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first or last is called with an integer on an unloaded association, the entire collection is loaded. This differs surprisingly from the behavior of Relation#first/last, which translate the call into a limit query. For large collections this can make a big difference in performance. Change CollectionAssociation#fetch_first_or_last_using_find? to make this kind of call delegate to Relation.
* | | | | Add CHANGELOG entry for #11698Rafael Mendonça França2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #11698 from dmathieu/sqlite_tasks_without_railsRafael Mendonça França2013-09-123-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Let the SQLite rake tasks run without rails
| * | | | | let the sqlite task run without railsDamien Mathieu2013-08-073-2/+4
| | | | | |
* | | | | | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-123-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Relation#from to accept other relations with bind values. Conflicts: activerecord/CHANGELOG.md
| * | | | | | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-083-0/+12
| | | | | | |
* | | | | | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not break params filtering on nil values
| * | | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #12149
* | | | | | | | Use the Rails binary when generating taskRafael Mendonça França2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy-edits [ci skip]
* | | | | | | | Merge pull request #12170 from siong1987/taskRafael Mendonça França2013-09-121-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Documentation on how to create custom rake tasks.
| * | | | | | | | [ci skip] Documentation on how to create custom rake tasks.Teng Siong Ong2013-09-101-1/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #12210 from vipulnsward/remove_extra_loopRafael Mendonça França2013-09-121-5/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary loop
| * | | | | | | | | Remove unnecessary loopVipul A M2013-09-131-5/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12209 from waynn/patch-4Rafael Mendonça França2013-09-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | "generates" applies to "collection radio" so it should be singular
| * | | | | | | | | | "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | I accidentally pushed this change to docrails before realizing that it's technically a code change, so I'm opening this pull request (and rolling back my change to docrails).
* / / / / / / / / / Add CHANGELOG entry for #10879Rafael Mendonça França2013-09-121-0/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #12112 from adamniedzielski/fix-form-for-namespace-and-asRafael Mendonça França2013-09-123-1/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form_for - fix :namespace and :as options clash Conflicts: actionview/CHANGELOG.md
| * | | | | | | | | form_for - fix :namespace and :as options clashAdam Niedzielski2013-09-093-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :as option should not overwrite :namespace option when generating html id attribute of the form element. id should be prefixed by specified namespace even if :as option is present Add test case showing the issue and code fixing it
* | | | | | | | | | Merge pull request #12198 from anupamc/masterRafael Mendonça França2013-09-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Removed semicolon and added space
| * | | | | | | | | | Removed semicolon and added spaceAnupam Choudhury2013-09-131-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12175 from JuanitoFatas/doc-patchRafael Mendonça França2013-09-121-5/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add missing setting locale code snippet.
| * | | | | | | | | | [ci skip] Fix links in section 5.3 of i18n.mdJuanito Fatas2013-09-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now all links point to the correct line number.
| * | | | | | | | | | [ci skip] Add missing setting locale code snippet.Juanito Fatas2013-09-101-0/+11
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for 3 Internationalizing your Application of i18n.md. Missing the code as mentioned in 2.3, setting locale. Without this, the example to add config/locales/pirate.yml will not work.
* | | | | | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-1311-129/+293
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 22:14:09 +0000