aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Fix `above` -> `below`yui-knk2015-06-011-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20392 from equiamos/equiamos-fix-typos-docsZachary Scott2015-05-311-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed typos. [ci skip]Morgan Owens2015-05-311-5/+5
* | | | | | | | | | | | Use `any?` rather than `present?` to check argseileencodes2015-05-312-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | no rails command short-cuts in the getting-started guide. [ci skip]Yves Senn2015-05-311-1/+1
* | | | | | | | | | | minor formatting changes in changelogs. [ci skip]Yves Senn2015-05-312-7/+7
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Attempt to fix travis failuresSean Griffin2015-05-301-0/+3
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Ensure symbols passed to `select` are always quotedSean Griffin2015-05-304-10/+37
* | | | | | | | | Add docs and changelog entry for 73aab03 [ci skip]Sean Griffin2015-05-302-1/+15
* | | | | | | | | Merge pull request #20380 from kamipo/add_changelog_for_17654Eileen M. Uchitelle2015-05-301-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add CHANGELOG entry for #17654 [ci skip]Ryuta Kamizono2015-05-301-0/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20378 from vngrs/fix_doc_of_match_methodKasper Timm Hansen2015-05-301-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20375 from yoongkang/docfixClaudio B.2015-05-301-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #20370 from manishspuri/masterGodfrey Chan2015-05-308-4/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add test to ensure tmp:clear works when tmp is missingYoong Kang Lim2015-05-301-0/+7
| * | | | | | | | Generate a `.keep` file in `tmp` folderYoong Kang Lim2015-05-304-1/+37
| * | | | | | | | `rake restart` should work without a `tmp` folderYoong Kang Lim2015-05-303-3/+12
|/ / / / / / / /
* | | | | | | | Require yaml for isolation testRafael Mendonça França2015-05-291-0/+1
* | | | | | | | Merge pull request #20370 from manishspuri/masterKasper Timm Hansen2015-05-292-5/+5
|\ \ \ \ \ \ \ \