Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17388 from akampjes/master | Arthur Nogueira Neves | 2015-10-12 | 4 | -0/+23 |
|\ | |||||
| * | ActionMailer https on URL with force_ssl = true | Andrew Kampjes | 2015-08-14 | 4 | -0/+23 |
* | | Merge pull request #21931 from paul/bugfix/remove-deprecated-pg_dump-flag | Yves Senn | 2015-10-12 | 3 | -5/+9 |
|\ \ | |||||
| * | | Remove deprecated pg_dump -i flag | Paul Sadauskas | 2015-10-10 | 1 | -1/+1 |
* | | | Merge pull request #21933 from kamipo/move_schema_definiton_classes_into_appr... | Yves Senn | 2015-10-12 | 3 | -115/+129 |
|\ \ \ | |||||
| * | | | Move schema creation class into `mysql/schema_creation.rb` | Ryuta Kamizono | 2015-10-11 | 2 | -53/+59 |
| * | | | Move schema definition classes into `mysql/schema_definitions.rb` | Ryuta Kamizono | 2015-10-11 | 2 | -62/+70 |
| |/ / | |||||
* | | | Merge pull request #21849 from yui-knk/refactor_regexp_to_string | Andrew White | 2015-10-12 | 4 | -7/+14 |
|\ \ \ | |||||
| * | | | Change `Journey::Route#verb` to return string instead of regexp. | yui-knk | 2015-10-03 | 4 | -7/+14 |
* | | | | edit pass over the project Gemfile [ci skip] | Xavier Noria | 2015-10-12 | 1 | -18/+17 |
* | | | | Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_plugins | Jeremy Daer | 2015-10-11 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | do not generate manifest.js in plugins | yuuji.yaginuma | 2015-10-12 | 2 | -1/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21934 from etdev/docs/deep-dup-typo | Claudio B. | 2015-10-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [ci skip] Fix typo in deep_dup docs | Eric Turner | 2015-10-12 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #11410 from bogdan/increment-concurency | Jeremy Daer | 2015-10-10 | 5 | -40/+42 |
|\ \ \ | |||||
| * | | | Make #increment! and #decrement! methods concurency safe | Bogdan Gusiev | 2015-10-05 | 5 | -40/+41 |
* | | | | Merge pull request #20940 from rafaelsales/allow-multiple-root-routes | Rafael Mendonça França | 2015-10-10 | 2 | -2/+11 |
|\ \ \ \ | |||||
| * | | | | Allow multiple `root` routes in same scope level | Rafael Sales | 2015-10-10 | 2 | -2/+11 |
|/ / / / | |||||
* | | | | Merge pull request #21631 from RobinClowers/fix-cache-instrumentation | Jeremy Daer | 2015-10-09 | 3 | -13/+43 |
|\ \ \ \ | |||||
| * | | | | Fix Cache#fetch instrumentation | Robin Clowers | 2015-09-14 | 1 | -13/+11 |
| * | | | | Add test cases for Cache#fetch instrumentation | Robin Clowers | 2015-09-14 | 1 | -0/+28 |
* | | | | | Merge pull request #21927 from ronakjangir47/remove_is_a_spec | Rafael Mendonça França | 2015-10-09 | 2 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | used predicate methods to avoid is_a? checks | Ronak Jangir | 2015-10-10 | 2 | -3/+5 |
* | | | | | | Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gem | Rafael Mendonça França | 2015-10-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | update to ruby-oci8 - 2.2.0 | Gaurav Sharma | 2015-10-10 | 1 | -1/+1 |
* | | | | | | Merge pull request #21878 from Gaurav2728/require_monitor | Matthew Draper | 2015-10-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | monitor is require for SneakersAdapter | Gaurav Sharma | 2015-10-06 | 1 | -1/+1 |
* | | | | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_public | Sean Griffin | 2015-10-08 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | change `prepare_destination` to public API [ci skip] | yuuji.yaginuma | 2015-10-08 | 1 | -1/+2 |
* | | | | | | | Avoid leaking the first relation we call #first on | Matthew Draper | 2015-10-09 | 2 | -3/+9 |
* | | | | | | | Merge pull request #21911 from tommyblue/master | Rafael Mendonça França | 2015-10-08 | 1 | -3/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Modify the scope method documentation | Tommaso Visconti | 2015-10-08 | 1 | -3/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21894 from abhishekjain16/refactor_with_dry | Rafael Mendonça França | 2015-10-08 | 1 | -10/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Follow DRY principle and remove duplication | Abhishek Jain | 2015-10-08 | 1 | -10/+6 |
* | | | | | | | | Merge pull request #21919 from akihiro17/remove-require | Arthur Nogueira Neves | 2015-10-08 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unused require | akihiro17 | 2015-10-08 | 1 | -1/+0 |
* | | | | | | | | | Merge pull request #21906 from scottgonzalez/form-helpers | Claudio B. | 2015-10-08 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Minor cleanup for form helpers guide [ci skip] | Scott González | 2015-10-08 | 1 | -6/+8 |
* | | | | | | | | | Merge pull request #21917 from y-yagi/remove_unused_require | Santiago Pastorino | 2015-10-08 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove unused require | yuuji.yaginuma | 2015-10-08 | 1 | -2/+0 |
* | | | | | | | | | | Merge pull request #21913 from kamipo/fix_subsecond_precision_supported_version | Sean Griffin | 2015-10-08 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix subsecond precision supported version | Ryuta Kamizono | 2015-10-08 | 1 | -3/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #21891 from AndyLampert/small-csrf-section-readability-imp... | Sean Griffin | 2015-10-08 | 1 | -4/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Improve readability in CSRF section of guide | Andy Lampert | 2015-10-07 | 1 | -4/+3 |
* | | | | | | | | | | Merge pull request #21686 from kamipo/remove_pk_and_sequence_for | Andrew White | 2015-10-08 | 3 | -31/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove unused `pk_and_sequence_for` in AbstractMysqlAdapter | Ryuta Kamizono | 2015-10-08 | 3 | -31/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | code gardening in transliterate.rb | Xavier Noria | 2015-10-07 | 1 | -2/+5 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #21804 from merhard/mounted_engine_route_fix | Andrew White | 2015-10-07 | 4 | -2/+64 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix mounted engine named routes regression | Matthew Erhard | 2015-10-07 | 4 | -2/+64 |
| |/ / / / / / / | |||||
* | | | | | | | | Output inline is set to true in the plugin. | Kasper Timm Hansen | 2015-10-07 | 2 | -3/+3 |