aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prevent duplicating `where` clauses when model is extended from an abstract c...Mehmet Emin İNAÇ2015-04-153-0/+14
* Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessageGodfrey Chan2015-04-121-1/+1
|\
| * Error message no longer tells you to set the (deprecated) secret_token.Dan2015-04-121-1/+1
|/
* Merge pull request #19732 from wazery/patch-2Kasper Timm Hansen2015-04-121-2/+2
|\
| * [ci skip] Update contributing guideIslam Wazery2015-04-121-2/+2
* | Fix a few typos and wrap some lines [ci skip]Robin Dupret2015-04-122-12/+21
* | Merge pull request #19734 from y-yagi/action_view_guideYves Senn2015-04-121-26/+0
|\ \
| * | remove reference to `register_javascript_expansion` and `register_stylesheet_...yuuji.yaginuma2015-04-121-26/+0
|/ /
* | Merge pull request #19733 from yuki24/speed-up-levenshteinRichard Schneeman2015-04-112-4/+10
|\ \
| * | Speed up Levenshtein by 50% and reduce 97% of memory usageYuki Nishijima2015-04-112-4/+10
* | | Merge pull request #19566 from aditya-kapoor/remove-dup-docRichard Schneeman2015-04-111-22/+10
|\ \ \ | |/ / |/| |
| * | [ci skip] remove duplicate doc for current_page?Aditya Kapoor2015-04-091-22/+10
* | | Remove mention of super old defined_javascript_functions method [ci skip]Carlos Antonio da Silva2015-04-111-4/+0
* | | Merge pull request #19721 from vngrs/validates_presence_of_missing_noteRobin Dupret2015-04-111-0/+4
|\ \ \
| * | | Missing note on validates_presence_of validation [ci skip]Mehmet Emin İNAÇ2015-04-111-0/+4
* | | | Merge pull request #19731 from wazery/rename_bin_to_exeMatthew Draper2015-04-126-6/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Rename railties/bin to railties/exeIslam Wazery2015-04-116-6/+10
|/ / /
* | | Merge pull request #19727 from supercaracal/fix_wrong_test_method_nameEileen M. Uchitelle2015-04-111-1/+1
|\ \ \
| * | | fix a wrong feature test method nameTaishi Kasuga2015-04-111-1/+1
* | | | [ci skip] Remove `link_to_function` and `button_from_function` from guideseileencodes2015-04-111-21/+0
* | | | Merge pull request #19728 from jonatack/patch-4Kasper Timm Hansen2015-04-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [skip ci] primay_key -> primary_keyJon Atack2015-04-111-1/+1
|/ / /
* | | Merge branch 'girishso-belongs_to_primary_key_doc'Zachary Scott2015-04-101-0/+20
|\ \ \
| * | | Copy edits for primary_key documentation in association guide. [ci skip]Zachary Scott2015-04-101-3/+4
| * | | Merge branch 'belongs_to_primary_key_doc' of https://github.com/girishso/rail...Zachary Scott2015-04-101-0/+19
|/| | |
| * | | added primary_key option documentation for belongs_to associationGirish S2014-09-231-0/+19
* | | | Merge pull request #17512 from JackDanger/danger/use-default-view-pattern-in-...Zachary Scott2015-04-101-1/+1
|\ \ \ \
| * | | | Using the real resolver pattern in docsJack Danger Canty2014-11-041-1/+1
* | | | | Copy edits for QueueAdapters docs to fix #17765 [ci skip]Zachary Scott2015-04-101-18/+18
* | | | | Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKelly/rails ...Zachary Scott2015-04-101-0/+56
|\ \ \ \ \
| * | | | | [ci skip] Adds documentation explaining table labels for Active Job QueueAdap...KingsleyKelly2015-04-091-7/+47
| * | | | | [ci skip] Adds rdoc for priority explaining what the labels in the table means.KingsleyKelly2015-04-061-0/+16
* | | | | | Merge pull request #19722 from sikachu/remove-ar-use_transactional_fixturesGuillermo Iguaran2015-04-102-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use `use_transactional_tests` in Active RecordPrem Sichanugrist2015-04-102-2/+2
|/ / / / /
* | | | | Merge pull request #19716 from yui-knk/fix/filter_nameZachary Scott2015-04-091-3/+3
|\ \ \ \ \
| * | | | | [ci skip] Downcases filter namesyui-knk2015-04-101-3/+3
|/ / / / /
* | | | | Merge pull request #19689 from marutosi/master-issue-19187Rafael Mendonça França2015-04-095-4/+39
|\ \ \ \ \
| * | | | | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Win...Toshi MARUYAMA2015-04-092-1/+23
| * | | | | wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rbToshi MARUYAMA2015-04-091-1/+5
| * | | | | Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on LinuxToshi MARUYAMA2015-04-092-2/+11
|/ / / / /
* | | | | Merge pull request #19712 from eliotsykes/active-job-config-guideRafael Mendonça França2015-04-092-0/+60
|\ \ \ \ \
| * | | | | Add Active Job to Configuring Guide [ci skip]Eliot Sykes2015-04-092-0/+60
* | | | | | Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_e...Rafael Mendonça França2015-04-093-3/+31
|\ \ \ \ \ \
| * | | | | | fix fails to force_ssl_redirection if session_store is disabledTaishi Kasuga2015-04-093-3/+31
* | | | | | | Merge pull request #19703 from vizcay/fix_code_staticsRafael Mendonça França2015-04-092-4/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | bugfix CodeStatics#calculate_directory_statics when dir has source extensionPablo Vizcay2015-04-092-4/+22
| |/ / / / /
* / / / / / redcarpet 3.2.2 has an XSS vulnerabilityAkira Matsuda2015-04-092-3/+3
|/ / / / /
* | | | | Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-countRafael Mendonça França2015-04-081-1/+1
|\ \ \ \ \
| * | | | | A shorter and more concise version of select..sizeTan Le2015-04-091-1/+1
* | | | | | Disable Active Job intregration tests.Rafael Mendonça França2015-04-081-0/+1