aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdocZachary Scott2015-06-181-0/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add RDoc about scope option on distance_of_time_in_wordsMauro George2015-06-181-0/+20
* | | | | | | | | | | Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-typesZachary Scott2015-06-181-1/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added documentation about passing custom disallowed types to Hash#from_xml [...Prathamesh Sonpatki2015-06-181-1/+19
* | | | | | | | | | | | Merge pull request #20618 from vngrs/fix_railties_testsEileen M. Uchitelle2015-06-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | fix railties testsMehmet Emin İNAÇ2015-06-181-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Tiny documentation fixes [ci skip]Robin Dupret2015-06-182-10/+12
* | | | | | | | | | | Merge pull request #20054 from trosborn/masterRobin Dupret2015-06-181-77/+107
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | updates caching guide to reflect current Rails capabilities [ci skip]Thomas Osborn2015-06-171-77/+107
* | | | | | | | | | | | Merge pull request #20614 from y-yagi/remove_rails_rack_debugger_from_guideZachary Scott2015-06-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remove `Rails::Rack::Debugger` from guides [ci skip]yuuji.yaginuma2015-06-181-3/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Remove ContentLength middleware from the defaults.Aaron Patterson2015-06-172-1/+5
* | | | | | | | | | | | Revert "Merge pull request #20584 from arthurnn/fix_url"Arthur Neves2015-06-173-19/+4
* | | | | | | | | | | | Merge pull request #20598 from timrogers/update-bundler-version-to-1-10-4Rafael Mendonça França2015-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update bundler to v1.10.4Tim Rogers2015-06-171-1/+1
* | | | | | | | | | | | | Merge pull request #20596 from vngrs/use_single_quote_in_gemfileKasper Timm Hansen2015-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use single quote in Railties generators Gemfile [ci skip]Mehmet Emin İNAÇ2015-06-171-1/+1
* | | | | | | | | | | | | Bump AMS to 0.10.0.rc2Santiago Pastorino2015-06-161-1/+1
* | | | | | | | | | | | | Merge pull request #20584 from arthurnn/fix_urlArthur Nogueira Neves2015-06-163-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Catch InvalidURIError on bad paths on redirect.Arthur Neves2015-06-163-4/+19
* | | | | | | | | | | | | | Merge pull request #20587 from vngrs/fix_descriptions_of_databases_rakeRafael Mendonça França2015-06-161-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix descriptions of databases.rake [ci skip]Mehmet Emin İNAÇ2015-06-171-11/+11
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #20588 from vngrs/minor_comment_fixArthur Nogueira Neves2015-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix the comment about attr_reader of headers [ci skip]Mehmet Emin İNAÇ2015-06-161-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | enforce a depth limit on XML documentsAaron Patterson2015-06-163-10/+15
* | | | | | | | | | | | | | Escape HTML entities in JSON keysRafael Mendonça França2015-06-162-0/+11
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20578 from dcrec1/regressionSean Griffin2015-06-162-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | raise ActiveModel::MissingAttributeError when trying to access a relationship...Diego Carrion2015-06-162-1/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20572 from arthurnn/db_resetYves Senn2015-06-161-4/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Small refactor on db:resetArthur Neves2015-06-151-4/+1
* | | | | | | | | | | | remove `header=` on the response object.Aaron Patterson2015-06-153-13/+16
* | | | | | | | | | | | set the default charset in response initializeAaron Patterson2015-06-151-4/+12
* | | | | | | | | | | | Merge pull request #20407 from vngrs/deprecate_implicit_status_for_head_methodMatthew Draper2015-06-165-12/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Deprecate passing hash as first parameter into ActionController::HeadMehmet Emin İNAÇ2015-06-155-12/+47
* | | | | | | | | | | | | Merge pull request #20108 from akshay-vishnoi/button-tagArthur Nogueira Neves2015-06-152-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add missing spec and documentation for button_tag helperAkshay Vishnoi2015-05-242-2/+22
* | | | | | | | | | | | | | Merge pull request #20257 from prathamesh-sonpatki/test-for-serial-for-quoted...Arthur Nogueira Neves2015-06-151-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added test case for serial? method when sequence name is not quotedPrathamesh Sonpatki2015-05-221-0/+6
* | | | | | | | | | | | | | Merge pull request #20107 from ankit8898/av_refac_record_tag_helperArthur Nogueira Neves2015-06-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed not needed includes, As record_tag_helper is moved to a gem we are notAnkit Gupta2015-05-101-2/+1
* | | | | | | | | | | | | | | Merge pull request #20573 from kaspth/fix-caching-test-for-realskiesMatthew Draper2015-06-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix flakyness.Kasper Timm Hansen2015-06-151-0/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | i18n guide: warn about default_url_options caching and locale selectors [ci s...Xavier Noria2015-06-151-4/+6
* | | | | | | | | | | | | | | document that default_url_options is cached per request [ci skip]Xavier Noria2015-06-151-1/+3
* | | | | | | | | | | | | | | Merge pull request #20564 from repinel/fix-generators-named-base-template-docArthur Nogueira Neves2015-06-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [ci skip] Fix the Rails::Generators::NamedBase#template docRoque Pinel2015-06-151-2/+2
* | | | | | | | | | | | | | | | Merge pull request #20440 from repinel/fix-message-verifier-encoding-issueMatthew Draper2015-06-162-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix the message verifier encoding issueRoque Pinel2015-06-142-1/+2
* | | | | | | | | | | | | | | | Merge pull request #20016 from steved/sdavidovitz/abort_if_pendingArthur Nogueira Neves2015-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | make sure to load_config for db:abort_if_pending_migrationsSteven Davidovitz2015-05-041-1/+1