aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #18924 from tgxworld/correct_module_in_depre_msgKasper Timm Hansen2015-02-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct module name in deprecation message.Guo Xiang Tan2015-02-131-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18923 from tgxworld/fix_deprecation_warning_messageKasper Timm Hansen2015-02-131-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Improve deprecation message.Guo Xiang Tan2015-02-131-1/+3
| * | | | | | | Do not recommend `xhr` since it is going to be deprecated.Guo Xiang Tan2015-02-131-3/+0
* | | | | | | | remove CHANGELOG entry for Rails 5.0 only feature. #18918Yves Senn2015-02-131-7/+0
* | | | | | | | Merge pull request #18918 from morgoth/do-not-overwrite-value-of-secret-token...Yves Senn2015-02-133-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not overwrite secret token value when already present.Wojciech Wnętrzak2015-02-123-2/+15
* | | | | | | | | Merge pull request #18922 from yui-knk/fix/action_controller_overviewYves Senn2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] escape under scoreyui-knk2015-02-131-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #18919 from nerdrew/missing-rack-utils-requireArthur Nogueira Neves2015-02-121-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | require rack/utils in exception_wrapperAndrew Lazarus2015-02-121-0/+1
|/ / / / / / /
* | | | | | | remove meta programmingAaron Patterson2015-02-121-3/+3
* | | | | | | there is always an integration session, so remove the checkAaron Patterson2015-02-121-1/+0
* | | | | | | lazily create the integration sessionAaron Patterson2015-02-122-11/+5
* | | | | | | use before_setup to set up test instance variablesAaron Patterson2015-02-121-7/+6
* | | | | | | Skip url_helpers instead of caching, speed up integration testseileencodes2015-02-122-18/+15
* | | | | | | Merge pull request #18915 from kamipo/extract_date_time_precision_testRafael Mendonça França2015-02-124-271/+102
|\ \ \ \ \ \ \
| * | | | | | | Extract `DateTimePrecisionTest`Ryuta Kamizono2015-02-134-271/+102
* | | | | | | | Optimize none? and one? relation query methods to use LIMIT and COUNT.Eugene Gilburg2015-02-126-2/+162
|/ / / / / / /
* | | | | | | Merge pull request #18844 from yuki24/guides-add-render-example-without-parti...Zachary Scott2015-02-121-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Add tip for skipping `partial` and `locals` options for `render`Yuki Nishijima2015-02-081-0/+15
* | | | | | | | Merge pull request #11790 from printercu/patch-3Rafael Mendonça França2015-02-123-14/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | ActionController#translate also lookups shortcut without action nameMax Melentiev2013-10-223-4/+13
| * | | | | | | | ActionController#translate supports symbolsprintercu2013-09-253-12/+28
* | | | | | | | | Merge pull request #18886 from kamipo/allow_precision_option_for_time_columnRafael Mendonça França2015-02-127-19/+90
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow `:precision` option for time type columnsRyuta Kamizono2015-02-127-19/+90
* | | | | | | | | | Merge pull request #18885 from ypxing/masterRafael Mendonça França2015-02-121-12/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unnecessary assignment and parameter passing in ActiveSupport::Callbac...rxing2015-02-111-12/+7
* | | | | | | | | | | get rid of transaction warning when running PG tests.Yves Senn2015-02-121-1/+1
* | | | | | | | | | | pg tests, be clear about the missing type that causes a test skip.Yves Senn2015-02-122-15/+8
* | | | | | | | | | | tests, remove unused requires.Yves Senn2015-02-122-2/+0
* | | | | | | | | | | Merge pull request #18911 from y-yagi/fix-typoKasper Timm Hansen2015-02-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix typo in fresh_when example [ci skip]yuuji.yaginuma2015-02-121-3/+3
* | | | | | | | | | | | Merge pull request #18907 from square/dont-load-app-on-structureYves Senn2015-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Schema creation doesn't load the appTamir Duberstein2015-02-111-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* / | | | | | | | | | Properly dump primitive-like AS::SafeBuffer strings as YAMLGodfrey Chan2015-02-113-1/+29
|/ / / / / / / / / /
* | | | | | | | | | Don't break enum on PGSean Griffin2015-02-111-1/+1
* | | | | | | | | | Refactor enum to be defined in terms of the attributes APISean Griffin2015-02-113-44/+59
* | | | | | | | | | `current_scope` shouldn't pollute sibling STI classesSean Griffin2015-02-114-6/+32
* | | | | | | | | | Merge pull request #18888 from kamipo/refactor_quote_default_expressionRafael Mendonça França2015-02-114-18/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor `quote_default_expression`Ryuta Kamizono2015-02-114-18/+12
* | | | | | | | | | | Merge pull request #18906 from awd/fix-test-descriptionRafael Mendonça França2015-02-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes wording of test descriptionAdam Doeler2015-02-111-1/+1
* | | | | | | | | | | | Merge pull request #18374 from claudiob/add-collection-to-fresh-whenRafael Mendonça França2015-02-113-11/+103
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Accept a collection in fresh_when and stale?claudiob2015-02-103-11/+103
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18845 from bogdan/remove-code-dups-in-action-viewRafael Mendonça França2015-02-112-33/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove code duplication in ActionView::Helpers::Tags::BaseBogdan Gusiev2015-02-112-33/+25
* | | | | | | | | | | | | Revert 88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbbRafael Mendonça França2015-02-112-13/+25
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Remove the SQLite3 Binary subclassSean Griffin2015-02-112-28/+0