aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #18587 from chrismcg/allow_deliver_later_queue_name_to_be_...Rafael Mendonça França2015-06-035-1/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Allow configuration of ActionMailer queue nameChris McGrath2015-06-025-1/+33
* | | | | | pass check_ip and proxies to GetIp constructorAaron Patterson2015-06-031-4/+4
* | | | | | Merge pull request #20421 from repinel/fix-clear-guides-and-related-api-docsRafael Mendonça França2015-06-032-8/+15
|\ \ \ \ \ \
| * | | | | | [ci skip] fix the `collection.clear` guideRoque Pinel2015-06-022-8/+15
|/ / / / / /
* | | | | | Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"Rafael Mendonça França2015-06-022-31/+8
* | | | | | Merge pull request #20383 from jonatack/fix-configurable-static-index-filenameSantiago Pastorino2015-06-021-3/+3
|\ \ \ \ \ \
| * | | | | | Fix regression in #20017: wrong number of arguments errorJon Atack2015-05-301-3/+3
* | | | | | | Merge pull request #20387 from y-yagi/fix_engine_generated_controller_testYves Senn2015-06-026-1/+48
|\ \ \ \ \ \ \
| * | | | | | | add test to run generated test files inside mountable engineyuuji.yaginuma2015-06-023-16/+25
| * | | | | | | add engine's namespace to fixture nameyuuji.yaginuma2015-05-313-1/+11
| * | | | | | | set engine's route in the functional test is generated in the engineyuuji.yaginuma2015-05-313-0/+24
* | | | | | | | Skip test that fails from outdated sqlite3 on travisSean Griffin2015-06-022-10/+9
* | | | | | | | Merge pull request #20413 from kddeisz/pluck_postgres_fixYves Senn2015-06-021-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix postgresql DISTINCT requirement in pluck testKevin Deisz2015-06-021-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #20410 from schneems/schneems/boo-global-varsRafael Mendonça França2015-06-013-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Use block variable instead of globalschneems2015-06-013-5/+5
* | | | | | | | | Merge pull request #20409 from davydovanton/doc-queue-adapterAbdelkader Boudih2015-06-021-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [skip ci] Add documentation for QueueAdapter::queue_adapterAnton Davydov2015-06-021-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20357 from ronakjangir47/remove_mocha1Rafael Mendonça França2015-06-011-27/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed use of mocha from railties actions_testRonak Jangir2015-06-011-27/+52
* | | | | | | | | | Merge pull request #20406 from yoongkang/add_edge_sprocketsSantiago Pastorino2015-06-011-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use sprockets-rails from github repoYoong Kang Lim2015-06-021-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #20405 from manish-shrivastava/masterRafael Mendonça França2015-06-015-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed typos in guidemanish-shrivastava2015-06-015-5/+7
* | | | | | | | | | | Merge pull request #19094 from phoet/have_bearer_be_valid_as_wellRafael Mendonça França2015-06-013-2/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add changelog entryphoet2015-06-011-0/+10
| * | | | | | | | | | | allow `Bearer` as well as `Token`phoet2015-06-012-1/+8
| * | | | | | | | | | | actually test what the name saysphoet2015-06-011-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #20362 from kddeisz/enumerable_pluckRafael Mendonça França2015-06-014-2/+43
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow Enumerable#pluck to take a splat.Kevin Deisz2015-05-294-2/+43
* | | | | | | | | | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-0126-880/+166
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-3026-880/+166
* | | | | | | | | | | | Merge pull request #20284 from kaspth/fix-caching-testRafael Mendonça França2015-06-013-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replace expectation with state check.Kasper Timm Hansen2015-05-303-3/+9
* | | | | | | | | | | | | Merge pull request #20398 from nkondratyev/fix-time-changeRafael Mendonça França2015-06-013-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix a range of values for parameters of the Time#changeNikolay Kondratyev2015-06-013-1/+9
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #20386 from yoongkang/circular_importRafael Mendonça França2015-06-011-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix circular import warning on buildYoong Kang Lim2015-05-311-1/+0
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_oracleRafael Mendonça França2015-06-012-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for OracleYasuo Honda2015-06-012-2/+6
* | | | | | | | | | | | | | Merge pull request #20403 from takiy33/patch-1Rafael Mendonça França2015-06-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use --no-document option instead of --no-rdoc and --no-ri optiontakiy332015-06-011-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20371 from davydovanton/doc-adapter-lookupYves Senn2015-06-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [skip ci] Update documentation for QueueAdapters::lookupAnton Davydov2015-06-011-0/+4
* | | | | | | | | | | | | | Merge pull request #20394 from mechanicles/use-symMatthew Draper2015-06-011-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | [ci skip] Used 'instance_variables' in example for consistency.Santosh Wadghule2015-06-011-2/+5
* | | | | | | | | | | | | | Merge pull request #20396 from nkondratyev/fix-guidesKasper Timm Hansen2015-06-011-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove description of `dependency_loading` optionNikolay Kondratyev2015-06-011-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #20393 from yui-knk/fix/guide2Arun Agrawal2015-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \