aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add missing sharp [ci skip]Greg Molnar2014-02-041-1/+1
* docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-041-1/+3
* Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belon...Rafael Mendonça França2014-02-042-1/+11
|\
| * fix HABTM w/out primary key errors on destructionKevin Casey2014-02-022-1/+11
* | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399.Yves Senn2014-02-043-1/+15
* | Merge pull request #13936 from edogawaconan/fix_docsGuillermo Iguaran2014-02-031-1/+1
|\ \
| * | Missing closing parenthesis.edogawaconan2014-02-041-1/+1
|/ /
* | Merge pull request #11770 from timruffles/doc_ajax_xhrYves Senn2014-02-031-2/+5
|\ \
| * | be more specific about csrf token and ajax - not whitelisted outside of jquer...Tim Ruffles2013-08-061-2/+5
* | | docs, be clear that `options` is a hash. Closes #11904. [ci skip].Yves Senn2014-02-031-1/+1
* | | some wording format changes. [ci skip]Yves Senn2014-02-032-6/+6
* | | pass `habtm :autosave` to underlying `hm:t` association. Closes #13923.Yves Senn2014-02-034-8/+35
* | | docs, revisit polymorphic associations with STI example. [ci skip]Yves Senn2014-02-031-2/+5
* | | docs, reference to ruby-lang.org. refs #13492. [ci skip]Yves Senn2014-02-031-4/+8
* | | `rails_guides/helpers.rb` requires `YAML` to run.Yves Senn2014-02-031-0/+2
* | | Merge pull request #13930 from calvintam/masterArun Agrawal2014-02-031-1/+1
|\ \ \
| * | | Fixed minor typo [ci skip]Calvin Tam2014-02-031-1/+1
|/ / /
* | | Merge pull request #13926 from fredwu/doc_polymorphic_sti_var_name_typoYves Senn2014-02-021-2/+2
|\ \ \
| * | | Fixes the camelCase variable name in the docs [ci skip]Fred Wu2014-02-031-2/+2
|/ / /
* | | Merge pull request #13924 from adomokos/adding_path_examples_to_button_to_testsRafael Mendonça França2014-02-022-0/+12
|\ \ \
| * | | Adding an documentation example and a test to button_to with pathAttila Domokos2014-02-022-0/+12
|/ / /
* | | Assert the file is deprecatedRafael Mendonça França2014-02-011-1/+1
* | | Fix isolated testsRafael Mendonça França2014-02-011-0/+1
* | | Merge pull request #13911 from davidcelis/remove-bigdecimal-serializationRafael Mendonça França2014-02-015-28/+33
|\ \ \
| * | | Remove BigDecimal#to_dDavid Celis2014-02-012-12/+0
| * | | Don't require BigDecimal serialization extensionDavid Celis2014-02-015-16/+33
* | | | Remove warnings for already defined methodsRafael Mendonça França2014-02-011-1/+3
* | | | Make arel methods private APIRafael Mendonça França2014-02-012-6/+5
* | | | Merge pull request #13688 from jbaudanza/psql-index-existsRafael Mendonça França2014-02-013-0/+35
|\ \ \ \
| * | | | psql implementation of #index_name_exists?Jonathan Baudanza2014-01-163-0/+35
* | | | | Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-013-4/+36
|\ \ \ \ \
| * | | | | Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-303-4/+36
* | | | | | Merge pull request #13912 from mauricio/bug-13907Rafael Mendonça França2014-02-013-2/+26
|\ \ \ \ \ \
| * | | | | | Fixes issue with parsing whitespace content back from database - fixes #13907Mauricio Linhares2014-02-013-2/+26
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #12769 from birkirb/masterRafael Mendonça França2014-02-013-2/+135
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix breakage in XmlMiniBirkir A. Barkarson2013-12-233-2/+136
* | | | | | this class depends on JoinHelper, so we should require itAaron Patterson2014-01-311-0/+2
* | | | | | just require the template resolverAaron Patterson2014-01-312-1/+1
* | | | | | only ask for the location filters onceAaron Patterson2014-01-312-6/+7
* | | | | | FilterRedirect is referenced at the class level from the ResponseAaron Patterson2014-01-312-1/+1
* | | | | | Maintain the current timezone in wrap_with_time_zoneAndrew White2014-01-313-7/+16
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #13780 from rohitpaulk/patch-1Rafael Mendonça França2014-01-311-0/+13
|\ \ \ \ \
| * | | | | Updated association_basics.md [ci skip]Rohit Paul Kuruvilla2014-01-311-0/+13
* | | | | | Minor changelog improvements [ci skip]Carlos Antonio da Silva2014-01-312-5/+5
* | | | | | Merge pull request #13900 from zzak/issue_12963Carlos Antonio da Silva2014-01-311-1/+1
|\ \ \ \ \ \
| * | | | | | Document default trim mode for Erubis and affected ERB tags [ci skip]Zachary Scott2014-01-311-1/+1
* | | | | | | Merge pull request #13896 from laurocaetano/dangerous_association_namesCarlos Antonio da Silva2014-01-315-0/+52
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-315-0/+52
* | | | | | | Merge pull request #13898 from timfenney/my_branchGodfrey Chan2014-01-301-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove unused variable.Tim Fenney2014-01-311-1/+1
|/ / / / / /