aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * 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 guide
| * [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_expansion` from guide [ci skip]
| * | remove reference to `register_javascript_expansion` and ↵yuuji.yaginuma2015-04-121-26/+0
|/ / | | | | | | | | | | `register_stylesheet_expansion` from guide [ci skip] These methods no longer exists.
* | Merge pull request #19733 from yuki24/speed-up-levenshteinRichard Schneeman2015-04-112-4/+10
|\ \ | | | | | | Speed up Levenshtein by 50% and reduce 97% of memory usage
| * | Speed up Levenshtein by 50% and reduce 97% of memory usageYuki Nishijima2015-04-112-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating ------------------------------------- each_char 924.000 i/100ms each_codepoint 1.381k i/100ms ------------------------------------------------- each_char 9.320k (¡Þ 5.1%) i/s - 47.124k each_codepoint 13.857k (¡Þ 3.6%) i/s - 70.431k Comparison: each_codepoint: 13857.4 i/s each_char: 9319.5 i/s - 1.49x slower The full report can be found here: https://gist.github.com/yuki24/a80988f35aceac76f1d5
* | | Merge pull request #19566 from aditya-kapoor/remove-dup-docRichard Schneeman2015-04-111-22/+10
|\ \ \ | |/ / |/| | [ci skip] remove duplicate doc for current_page?
| * | [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
| | | | | | | | | | | | It was removed long ago: e358b1fce8fdcbac896dde08286be020420e843e.
* | | 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]
| * | | Missing note on validates_presence_of validation [ci skip]Mehmet Emin İNAÇ2015-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Without this note, someone can misunderstand the usage of validates_presence_of method add missing note for the validates_presence_of
* | | | Merge pull request #19731 from wazery/rename_bin_to_exeMatthew Draper2015-04-126-6/+10
|\ \ \ \ | |_|_|/ |/| | | Rename railties/bin to railties/exe to match the new Bundler convention
| * | | Rename railties/bin to railties/exeIslam Wazery2015-04-116-6/+10
|/ / / | | | | | | | | | | | | | | | That will match the new Bundler executables convention. Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html Also updated the necessary tests.
* | | Merge pull request #19727 from supercaracal/fix_wrong_test_method_nameEileen M. Uchitelle2015-04-111-1/+1
|\ \ \ | | | | | | | | fix a wrong feature test method name
| * | | 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
| | | | | | | | | | | | | | | | | | | | These methods were removed in cb9f7f4 and are no longer methods in the Rails codebase.
* | | | Merge pull request #19728 from jonatack/patch-4Kasper Timm Hansen2015-04-111-1/+1
|\ \ \ \ | |/ / / |/| | | [skip ci] primay_key -> primary_key
| * | | [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 ↵Zachary Scott2015-04-101-0/+19
|/| | | | | | | | | | | | | | | https://github.com/girishso/rails into girishso-belongs_to_primary_key_doc
| * | | added primary_key option documentation for belongs_to associationGirish S2014-09-231-0/+19
| | | | | | | | | | | | | | | | fixes issue #16698
* | | | Merge pull request #17512 from ↵Zachary Scott2015-04-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | JackDanger/danger/use-default-view-pattern-in-docs [docs] Using the real resolver pattern in docs
| * | | | Using the real resolver pattern in docsJack Danger Canty2014-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If someone copies the docs into their app they'll find it simply doesn't work because the locale pattern doesn't have the same logic. This makes the doc examples work exactly as written. [ci skip]
* | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into queue-adapter-docs
| * | | | | [ci skip] Adds documentation explaining table labels for Active Job ↵KingsleyKelly2015-04-091-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | QueueAdapters table in docs.
| * | | | | [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 Record
| * | | | | Use `use_transactional_tests` in Active RecordPrem Sichanugrist2015-04-102-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | `use_transactional_fixtures` was deprecated in favor of `use_transactional_tests` in Rails 5.0. This removes one warning while running test suite.
* | | | | Merge pull request #19716 from yui-knk/fix/filter_nameZachary Scott2015-04-091-3/+3
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Downcases filter names
| * | | | | [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 Windows
| * | | | | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on ↵Toshi MARUYAMA2015-04-092-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows * https://github.com/rails/rails/issues/19187 * https://github.com/rails/rails/pull/19533 * https://github.com/macournoyer/thin/issues/268 These are serious Rails 4 regression for Redmine Bitnami Windows users. https://community.bitnami.com/t/problems-with-3-0-1-installation-see-report-inside/30195/ It is not caused on webrick users. Related: * https://github.com/rack/rack/issues/732#issuecomment-67677272 * https://github.com/phusion/passenger/issues/1328
| * | | | | wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rbToshi MARUYAMA2015-04-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related: #19617, #19187, #19533, #19689, #19675. 'drb/unix' does not exist on mingw.
| * | | | | Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on LinuxToshi MARUYAMA2015-04-092-2/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related: #19617, #19187, #19533, #19689, #19675. This is POC (Proof Of Concept) which bundler does not remove mingw lines. https://github.com/rails/rails/pull/19617#issuecomment-90293795
* | | | | 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]
| * | | | | Add Active Job to Configuring Guide [ci skip]Eliot Sykes2015-04-092-0/+60
| | | | | |
* | | | | | Merge pull request #19682 from ↵Rafael Mendonça França2015-04-093-3/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error Fix fails to force_ssl_redirection if session_store is disabled
| * | | | | | 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 ext
| * | | | | | 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
|/ / / / / | | | | | | | | | | | | | | | see: http://www.openwall.com/lists/oss-security/2015/04/07/11
* | | | | 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..size
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | They may be fixed at #19470
* | | | | | Merge pull request #19685 from vngrs/actionview_parent_layout_bugRafael Mendonça França2015-04-082-8/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix for actionview parent layout bug
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 13:50:47 +0000