aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add bundle check to release taskRafael Mendonça França2015-11-051-1/+5
* tests, test should not care wether 9ms or 11ms have passed.Yves Senn2015-11-041-1/+1
* Replace `serve_static_files` mentions in docs.Kasper Timm Hansen2015-11-044-6/+8
* Replace `serve_static_files` in tests with `public_file_server.enabled`.Kasper Timm Hansen2015-11-044-5/+5
* tests, define `Rails.root` before loading Action Mailer.Yves Senn2015-11-042-8/+8
* Merge pull request #22173 from kaspth/enable-public-file-serverKasper Timm Hansen2015-11-047-17/+84
|\
| * Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-042-5/+22
| * Add enabled flag to the public file server.Kasper Timm Hansen2015-11-036-12/+62
* | Merge pull request #22182 from seanlinsley/patch-1Rafael França2015-11-041-0/+7
|\ \
| * | document `try!` in ActiveSupport core ext guideSean Linsley2015-11-041-0/+7
|/ /
* | Merge pull request #22180 from usertesting/arbitrary-url-in-link-to-backRafael França2015-11-043-2/+33
|\ \
| * | Don’t allow arbitrary data in back urlsDamien Burke2015-11-033-2/+33
| |/
* | formatting pass over Active Record changelog. [ci skip]Yves Senn2015-11-041-18/+20
* | Merge pull request #22174 from metaskills/defsetupYves Senn2015-11-043-7/+6
|\ \
| * | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-041-1/+0
| * | Update docs/comments to use setup/teardown blocks vs. methods.Ken Collins2015-11-033-6/+6
| |/
* | Remove incorrect commentsAndrew White2015-11-041-4/+0
* | Fix spelling error [ci skip]Andrew White2015-11-041-1/+1
* | don't start a new process for every test fileAaron Patterson2015-11-031-8/+21
* | Fix deprecation message when frame doesn't have absolute_pathRafael Mendonça França2015-11-031-1/+1
|/
* Add tests to make sure mail_to work with nil and SafeBufferRafael Mendonça França2015-11-031-0/+14
* Merge pull request #18774 from yuki24/deprecate-original-exception-infavor-of...Jeremy Daer2015-11-0330-90/+179
|\
| * Deprecate exception#original_exception in favor of exception#causeYuki Nishijima2015-11-0330-90/+179
* | Merge pull request #22164 from yui-knk/test_float_limitsAndrew White2015-11-032-12/+48
|\ \
| * | Add test_float_limits to mysql2yui-knk2015-11-032-12/+48
| |/
* | Merge pull request #22162 from Gaurav2728/added_instruction_for_rack_corsAndrew White2015-11-031-2/+4
|\ \ | |/ |/|
| * added missing instructions for `rack-cors`Gaurav Sharma2015-11-031-2/+4
|/
* remove present? call; we do not need itAaron Patterson2015-11-021-1/+1
* Merge pull request #21841 from yui-knk/fix_migration_statusAndrew White2015-11-024-7/+80
|\
| * Make `db:migrate:status` to render `1_some.rb` format migrate files.yui-knk2015-11-024-7/+80
* | Merge pull request #22156 from yui-knk/fix_test_mysqlAndrew White2015-11-021-1/+1
|\ \
| * | Fix test_database_created_by_root of mysqlyui-knk2015-11-021-1/+1
| |/
* | Merge pull request #22142 from r11runner/query-guide-first-last-default-scopeYves Senn2015-11-021-0/+4
|\ \ | |/ |/|
| * [ci skip] querying guide methods first and last: mentioning the influence of ...r11runner2015-10-311-0/+4
* | Merge pull request #22152 from y-yagi/remove_sass-cache_from_gitignoreAndrew White2015-11-021-1/+0
|\ \
| * | remove unnecessary `.sass-cache` from plugin's gitignore templateyuuji.yaginuma2015-11-021-1/+0
| |/
* | Merge pull request #22133 from yui-knk/sanitize_sql_for_orderAndrew White2015-11-025-5/+30
|\ \
| * | Define `sanitize_sql_for_order` for AR and use it inside `preprocess_order_args`yui-knk2015-11-025-5/+30
|/ /
* | Merge pull request #22090 from kamipo/bigint_default_nilAndrew White2015-11-024-3/+36
|\ \
| * | Allow bigint with default nil for avoiding auto increment primary keyRyuta Kamizono2015-11-024-3/+36
|/ /
* | Merge pull request #22061 from kamipo/remove_default_charset_and_collationAndrew White2015-11-023-21/+13
|\ \
| * | Remove `DEFAULT_CHARSET` and `DEFAULT_COLLATION` in `MySQLDatabaseTasks`Ryuta Kamizono2015-11-023-21/+13
|/ /
* | Merge pull request #22130 from k0kubun/left-joins-changelogAndrew White2015-11-021-0/+5
|\ \
| * | Add CHANGELOG entry for #22125 [ci skip]Takashi Kokubun2015-11-021-0/+5
|/ /
* | Merge pull request #22131 from yui-knk/move_test_to_inheritance_testAndrew White2015-11-022-80/+80
|\ \
| * | Move some AR test cases to inheritance_test.rbyui-knk2015-10-312-80/+80
* | | Merge pull request #22149 from samphilipd/masterAndrew White2015-11-011-0/+5
|\ \ \
| * | | Update changelog for #22122Sam Davies2015-11-011-0/+5
|/ / /
* | | Merge pull request #22147 from jwworth/pull-request/double-stringRichard Schneeman2015-11-011-1/+1
|\ \ \
| * | | Fix double word 'string' [ci skip]Jake Worth2015-11-011-1/+1
|/ / /