aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-124-0/+23
|\
| * ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-144-0/+23
* | Merge pull request #21931 from paul/bugfix/remove-deprecated-pg_dump-flagYves Senn2015-10-123-5/+9
|\ \
| * | Remove deprecated pg_dump -i flagPaul Sadauskas2015-10-101-1/+1
* | | Merge pull request #21933 from kamipo/move_schema_definiton_classes_into_appr...Yves Senn2015-10-123-115/+129
|\ \ \
| * | | Move schema creation class into `mysql/schema_creation.rb`Ryuta Kamizono2015-10-112-53/+59
| * | | Move schema definition classes into `mysql/schema_definitions.rb`Ryuta Kamizono2015-10-112-62/+70
| |/ /
* | | Merge pull request #21849 from yui-knk/refactor_regexp_to_stringAndrew White2015-10-124-7/+14
|\ \ \
| * | | Change `Journey::Route#verb` to return string instead of regexp.yui-knk2015-10-034-7/+14
* | | | edit pass over the project Gemfile [ci skip]Xavier Noria2015-10-121-18/+17
* | | | Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_pluginsJeremy Daer2015-10-112-1/+2
|\ \ \ \
| * | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
| | |/ / | |/| |
* | | | Merge pull request #21934 from etdev/docs/deep-dup-typoClaudio B.2015-10-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Fix typo in deep_dup docsEric Turner2015-10-121-1/+1
|/ / /
* | | Merge pull request #11410 from bogdan/increment-concurencyJeremy Daer2015-10-105-40/+42
|\ \ \
| * | | Make #increment! and #decrement! methods concurency safeBogdan Gusiev2015-10-055-40/+41
* | | | Merge pull request #20940 from rafaelsales/allow-multiple-root-routesRafael Mendonça França2015-10-102-2/+11
|\ \ \ \
| * | | | Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
|/ / / /
* | | | Merge pull request #21631 from RobinClowers/fix-cache-instrumentationJeremy Daer2015-10-093-13/+43
|\ \ \ \
| * | | | Fix Cache#fetch instrumentationRobin Clowers2015-09-141-13/+11
| * | | | Add test cases for Cache#fetch instrumentationRobin Clowers2015-09-141-0/+28
* | | | | Merge pull request #21927 from ronakjangir47/remove_is_a_specRafael Mendonça França2015-10-092-3/+5
|\ \ \ \ \
| * | | | | used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
* | | | | | Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gemRafael Mendonça França2015-10-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | update to ruby-oci8 - 2.2.0Gaurav Sharma2015-10-101-1/+1
* | | | | | Merge pull request #21878 from Gaurav2728/require_monitorMatthew Draper2015-10-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | monitor is require for SneakersAdapterGaurav Sharma2015-10-061-1/+1
* | | | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_publicSean Griffin2015-10-081-1/+2
|\ \ \ \ \ \
| * | | | | | change `prepare_destination` to public API [ci skip]yuuji.yaginuma2015-10-081-1/+2
* | | | | | | Avoid leaking the first relation we call #first onMatthew Draper2015-10-092-3/+9
* | | | | | | Merge pull request #21911 from tommyblue/masterRafael Mendonça França2015-10-081-3/+8
|\ \ \ \ \ \ \
| * | | | | | | Modify the scope method documentationTommaso Visconti2015-10-081-3/+8
| |/ / / / / /
* | | | | | | Merge pull request #21894 from abhishekjain16/refactor_with_dryRafael Mendonça França2015-10-081-10/+6
|\ \ \ \ \ \ \
| * | | | | | | Follow DRY principle and remove duplicationAbhishek Jain2015-10-081-10/+6
* | | | | | | | Merge pull request #21919 from akihiro17/remove-requireArthur Nogueira Neves2015-10-081-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused requireakihiro172015-10-081-1/+0
* | | | | | | | | Merge pull request #21906 from scottgonzalez/form-helpersClaudio B.2015-10-081-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Minor cleanup for form helpers guide [ci skip]Scott González2015-10-081-6/+8
* | | | | | | | | Merge pull request #21917 from y-yagi/remove_unused_requireSantiago Pastorino2015-10-081-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused requireyuuji.yaginuma2015-10-081-2/+0
* | | | | | | | | | Merge pull request #21913 from kamipo/fix_subsecond_precision_supported_versionSean Griffin2015-10-081-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix subsecond precision supported versionRyuta Kamizono2015-10-081-3/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #21891 from AndyLampert/small-csrf-section-readability-imp...Sean Griffin2015-10-081-4/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve readability in CSRF section of guideAndy Lampert2015-10-071-4/+3
* | | | | | | | | | Merge pull request #21686 from kamipo/remove_pk_and_sequence_forAndrew White2015-10-083-31/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused `pk_and_sequence_for` in AbstractMysqlAdapterRyuta Kamizono2015-10-083-31/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | code gardening in transliterate.rbXavier Noria2015-10-071-2/+5
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #21804 from merhard/mounted_engine_route_fixAndrew White2015-10-074-2/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix mounted engine named routes regressionMatthew Erhard2015-10-074-2/+64
| |/ / / / / / /
* | | | | | | | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-072-3/+3