aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #28212 from y-yagi/user_released_webpacker_in_new_applicat...Rafael França2017-02-271-1/+1
|\ \ \ \ \ \
| * | | | | | Use released webpacker in new applicationsyuuji.yaginuma2017-02-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #28061 from andrewhood125/strip_tags_updateRafael França2017-02-273-4/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove `encode_special_chars` option from `strip_tags`Andrew Hood2017-02-273-4/+19
|/ / / / /
* | | | | Merge pull request #28196 from y-yagi/set_correct_host_except_development_env...Andrew White2017-02-272-3/+25
|\ \ \ \ \
| * | | | | Set correct host except development environmentyuuji.yaginuma2017-02-272-3/+25
* | | | | | Merge pull request #28199 from kirs/ar-test-connectionMatthew Draper2017-02-281-1/+4
|\ \ \ \ \ \
| * | | | | | Handle non-existing $ARCONNKir Shatrov2017-02-271-1/+4
* | | | | | | Merge pull request #28160 from y-yagi/only_load_systemtestcase_if_puma_is_def...Eileen M. Uchitelle2017-02-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Only load SystemTestCase if Puma is definedyuuji.yaginuma2017-02-271-2/+2
* | | | | | | | Merge pull request #28188 from kamipo/use_max_identifier_length_for_index_nam...Andrew White2017-02-264-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `max_identifier_length` for `index_name_length` in PostgreSQL adapterRyuta Kamizono2017-02-274-8/+8
* | | | | | | | | Merge pull request #28187 from kamipo/fix_intermittent_test_failureAndrew White2017-02-261-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix `test_apply_distinct_in_count` failure in PG adapterRyuta Kamizono2017-02-271-0/+3
* | | | | | | | | | Merge pull request #25274 from kamipo/fix_find_nth_with_limit_valueAndrew White2017-02-262-6/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `find_nth` with `limit_value`Ryuta Kamizono2017-02-262-6/+10
* | | | | | | | | | | Merge pull request #28190 from annejohnson/update-i18n-guide-with-zero-optJon Moss2017-02-261-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update i18n guide to cover :zero key support in pluralization [ci skip]Anne Johnson2017-02-261-2/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28172 from kamipo/deprecate_supports_migrationsAndrew White2017-02-2613-338/+306
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate `supports_migrations?` on connection adaptersRyuta Kamizono2017-02-2713-338/+306
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #28186 from kirs/patch-2Andrew White2017-02-261-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor connection_pool_testKir Shatrov2017-02-261-1/+4
|/ / / / / / / / /
* | | | | | | | | [ci skip] Add CHANGELOG entry for #28183Andrew White2017-02-261-0/+4
* | | | | | | | | Merge pull request #28183 from eugeneius/having_select_columnAndrew White2017-02-262-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include selects in group query with having clauseEugene Kenny2017-02-262-1/+3
* | | | | | | | | | Merge pull request #28106 from jerry-tao/masterAndrew White2017-02-262-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused params.Jerry Tao2017-02-262-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #28176 from kamipo/push_valid_type_up_to_abstract_adapterAndrew White2017-02-264-11/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Push `valid_type?` up to abstract adapterRyuta Kamizono2017-02-264-11/+3
* | | | | | | | | Merge pull request #28177 from kami-zh/remove-duplicated-privateAndrew White2017-02-261-102/+100
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicated private methodkami-zh2017-02-261-102/+100
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #28179 from kamipo/remove_useless_lineAndrew White2017-02-261-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove useless `select_values += select_values`Ryuta Kamizono2017-02-261-1/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #28180 from y-yagi/use_released_arelAndrew White2017-02-261-1/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use released arelyuuji.yaginuma2017-02-261-1/+0
|/ / / / / / / /
* | | | | | | | Add Duration#before and #after as aliases for #ago and #sinceNick Johnstone2017-02-263-0/+31
* | | | | | | | Merge pull request #28175 from sevenseacat/patch-1Kasper Timm Hansen2017-02-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo 'affect' -> 'effect' [ci skip]Rebecca Skinner2017-02-261-1/+1
|/ / / / / / / /
* | | | | | | | Fix `change_column` to drop default with `null: false`Ryuta Kamizono2017-02-264-5/+14
* | | | | | | | Merge pull request #28173 from vipulnsward/as-ch-passKasper Timm Hansen2017-02-261-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | AS CHANGELOG Pass [ci skip]Vipul A M2017-02-261-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #28167 from kirs/deprecate-verify-argsMatthew Draper2017-02-262-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Deprecate AbstractAdapter#verify! with argumentsKir Shatrov2017-02-252-0/+15
* | | | | | | | Merge pull request #28169 from kirs/ensure-conn-verifyMatthew Draper2017-02-262-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use ensure block for things we cleanup in testsKir Shatrov2017-02-252-1/+2
| |/ / / / / / /
* | | / / / / / Suppress `DISTINCT` clause outside aggregate functionRyuta Kamizono2017-02-252-2/+13
| |_|/ / / / / |/| | | | | |
* | | | | | | Commit flash changes when using a redirect route.Andrew White2017-02-253-0/+58
* | | | | | | Merge pull request #28162 from dixpac/update-docs-Rails_AppGeneratorJon Moss2017-02-251-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Imporove docs for Rails::AppGenerator [ci skip]dixpac2017-02-251-0/+8
* | | | | | | | [ci ckip] Fix example of resolve in CHANGELOG.mdAndrew White2017-02-251-1/+1
|/ / / / / / /