aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methodsAaron Patterson2013-10-241-6/+3
|\ | | | | Always check to see if methods exist after calling define_attribute_methods
| * always check to see if methods exist after calling define_attribute_methodsMatt Jones2013-10-241-6/+3
| |
* | Add CHANGELOG entry for #12635 [ci skip]Rafael Mendonça França2013-10-241-0/+4
| |
* | Merge pull request #12635 from mperham/4-0-stableGuillermo Iguaran2013-10-241-1/+0
| | | | | | | | Allow any version of BCrypt
* | Merge pull request #10471 from andyw8/button_to_paramsRafael Mendonça França2013-10-243-0/+19
|\ \ | | | | | | | | | | | | | | | | | | Add params option for button_to Conflicts: actionpack/CHANGELOG.md
| * | Add params option for button_toAndy Waite2013-09-183-0/+19
| | | | | | | | | | | | | | | | | | The parameters are rendered as hidden form fields within the generated form. This is useful for when a record has multiple buttons associated with it, each of which target the same controller method, but which need to submit different attributes.
* | | Merge pull request #12611 from antonio/slice_bang_honor_default_procRafael Mendonça França2013-10-243-0/+24
|\ \ \ | | | | | | | | Make slice! honor default hash value/proc
| * | | slice! should not remove default hash value/procAntonio Santos2013-10-243-0/+24
| | | |
* | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-10-241-10/+9
| | | |
* | | | Merge pull request #12624 from timsly/masterRafael Mendonça França2013-10-241-0/+16
|\ \ \ \ | |_|_|/ |/| | | update CHANGELOG
| * | | update CHANGELOGTima Maslyuchenko2013-10-241-0/+16
| |/ /
* | | Merge pull request #12629 from Peeja/has_many-pets-typoGuillermo Iguaran2013-10-241-1/+1
|\ \ \ | |/ / |/| | Fix typo: `has_many :pets`, not `pets :has_many`.
| * | Fix typo: `has_many :pets`, not `pets :has_many`.Peter Jaros2013-10-241-1/+1
|/ /
* | Merge pull request #12622 from timsly/helpers-from-outsideGuillermo Iguaran2013-10-232-1/+11
|\ \ | | | | | | pass app config to controller helper proxy
| * | pass app config to controller helper proxyTima Maslyuchenko2013-10-242-1/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this fix application config become available when calling helper outisde of view config/application.rb #... config.asset_host = 'http://mycdn.com' #... Somewhere else ActionController::Base.helpers.asset_path('fallback.png') # => http://mycdn.com/assets/fallback.png
* | Merge pull request #12619 from Veraticus/fix_utils_normalize_pathRafael Mendonça França2013-10-232-1/+9
|\ \ | | | | | | Correct error in Utils.normalize_path that changed paths improperly
| * | Correct error in Utils.normalize_path that changed paths improperlyJosh Symonds2013-10-232-1/+9
| | |
* | | Fix the install taskRafael Mendonça França2013-10-231-9/+1
|/ /
* | Merge pull request #12617 from skv-headless/masterRafael Mendonça França2013-10-231-4/+3
|\ \ | | | | | | [ci skip] second parameter of asset-url is deprecated
| * | [ci skip] second parameter of asset-url is depricatedEvgeniy2013-10-231-4/+3
| | |
* | | Merge pull request #12612 from ↵Rafael Mendonça França2013-10-233-6/+34
|\ \ \ | |/ / |/| | | | | | | | amatsuda/amo_validates_inclusion_of_time_range_error Let validates_inclusion_of accept Time and DateTime ranges
| * | Let validates_inclusion_of accept Time and DateTime rangesAkira Matsuda2013-10-233-6/+34
|/ / | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85
* | Try arel masterRafael Mendonça França2013-10-221-0/+1
| | | | | | | | | | Conflicts: Gemfile
* | this should be private, no other instances of Root should call itAaron Patterson2013-10-221-1/+1
| |
* | do not search through the keys array twiceAaron Patterson2013-10-221-2/+3
| |
* | use the provided block to filter listsAaron Patterson2013-10-221-11/+5
| |
* | stop using `send` so that method privacy is respected and we get a smallAaron Patterson2013-10-221-7/+7
| | | | | | | | perf increase
* | Fix order dependent testsRafael Mendonça França2013-10-221-4/+4
| |
* | Merge pull request #12606 from robin850/apps-with-spacesYves Senn2013-10-224-2/+20
|\ \ | | | | | | Make the application name snake cased when it contains spaces
| * | Make the application name snake cased when it contains spacesRobin Dupret2013-10-224-2/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The application name is used to fill the `database.yml` and `session_store.rb` files ; previously, if the provided name contained whitespaces, it led to unexpected names in these files. Since Shellwords.escape adds backslashes to escape spaces, the app_name should remove them and replace any space with an underscore (just like periods previously). Also improve the assert_file helper to work with paths containing spaces using String#shellescape.
* | minor Active Record CHANGELOG cleanup. [ci skip].Yves Senn2013-10-221-3/+3
| |
* | move helper class to the topAaron Patterson2013-10-211-42/+42
| |
* | build the association graph functionallyAaron Patterson2013-10-213-20/+13
| | | | | | | | This lets us avoid the constant calls to Array#<<
* | Merge branch 'master' into joindepAaron Patterson2013-10-2126-244/+418
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Escape the parentheses in the default function regexp Update docs on Tilt::Template in Asset Pipeline guide Fix loading a sql structure file on postgres when the file's path has whitespace in it remove trailing whitespace added with b057765 [ci skip]. Allow unscope to work with `where.not` Raise an exception when model without primary key calls .find_with_ids Process sub-query relation's binding values Instrument the generation of Action Mailer messages Remove extra variable creation and merge. In Relation#empty? use #exists? instead of #count. [ci skip] avoid deprecation warning in sample code Convert Fixnum into String the port number in MySQL Fix some indentation on autosave association Make define_non_cyclic_method simpler Add Sass gobbling info to asset pipeline docs Ensure the state is clean after one failure Fix typo in form_helper.rb add a new local variable to track if digests are being stored, to ensure the cleanup works correctly [ci skip] Fix number of methods added by association. update digestor code based on review ...
| * \ Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sqlRafael Mendonça França2013-10-214-6/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Inline bind values for sub-queries generated for Relation in where Conflicts: activerecord/CHANGELOG.md
| | * | Process sub-query relation's binding valuesPaul Nikitochkin2013-10-204-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated sub-query for Relation as array condition for `where` method did not take in account its bind values, in result generates invalid SQL query. Fixed by adding sub-query relation's binding values to base relation Closes: #12586
| * | | Escape the parentheses in the default function regexpRafael Mendonça França2013-10-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing every default value in PostreSQL database to being handled as default function. Fixes #12581
| * | | Merge pull request #12567 from GoBoundless/fix_postgres_structure_importYves Senn2013-10-213-1/+13
| |\ \ \ | | | | | | | | | | Fix loading a sql structure file on postgres when the file's path has whitespace in it
| | * | | Fix loading a sql structure file on postgres when the file's path has ↵Kevin Mook2013-10-213-1/+13
| | | | | | | | | | | | | | | | | | | | whitespace in it
| * | | | Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docsGuillermo Iguaran2013-10-211-3/+8
| |\ \ \ \ | | |/ / / | |/| | | Update docs on Tilt::Template in Asset Pipeline guide
| | * | | Update docs on Tilt::Template in Asset Pipeline guideDavid Verhasselt2013-10-211-3/+8
| |/ / /
| * | | remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
| | | |
| * | | Merge pull request #12565 from stormsilver/unscope_fixesYves Senn2013-10-213-7/+23
| |\ \ \ | | | | | | | | | | Allow unscope to work with `where.not`
| | * | | Allow unscope to work with `where.not`Eric Hankins2013-10-213-7/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | Allows you to call #unscope on a relation with negative equality operators, i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated through the use of where.not.
| * | | Merge pull request #12549 from makimoto/raise-when-find-without-pkYves Senn2013-10-213-0/+13
| |\ \ \ | | | | | | | | | | Raise an exception when model without primary key calls .find_with_ids
| | * | | Raise an exception when model without primary key calls .find_with_idsShimpei Makimoto2013-10-213-0/+13
| |/ / /
| * | | Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
| |\ \ \ | | | | | | | | | | Remove extra variable creation and merge.
| | * | | Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
| | | | |
| * | | | Merge pull request #12556 from dasch/dasch/nstrument-am-processingJosé Valim2013-10-204-7/+29
| |\ \ \ \ | | |/ / / | |/| | | Instrument the generation of Action Mailer messages
| | * | | Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-7/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | The processing of outbound mail is instrumented with the key `process.action_mailer`. The payload includes the mailer name as well as the mailer method.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 12:15:15 +0000