Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix regression in #20017: wrong number of arguments error | Jon Atack | 2015-05-30 | 1 | -3/+3 | |
* | | | | | | | Merge pull request #20387 from y-yagi/fix_engine_generated_controller_test | Yves Senn | 2015-06-02 | 6 | -1/+48 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add test to run generated test files inside mountable engine | yuuji.yaginuma | 2015-06-02 | 3 | -16/+25 | |
| * | | | | | | | add engine's namespace to fixture name | yuuji.yaginuma | 2015-05-31 | 3 | -1/+11 | |
| * | | | | | | | set engine's route in the functional test is generated in the engine | yuuji.yaginuma | 2015-05-31 | 3 | -0/+24 | |
* | | | | | | | | Skip test that fails from outdated sqlite3 on travis | Sean Griffin | 2015-06-02 | 2 | -10/+9 | |
* | | | | | | | | Merge pull request #20413 from kddeisz/pluck_postgres_fix | Yves Senn | 2015-06-02 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix postgresql DISTINCT requirement in pluck test | Kevin Deisz | 2015-06-02 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20410 from schneems/schneems/boo-global-vars | Rafael Mendonça França | 2015-06-01 | 3 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use block variable instead of global | schneems | 2015-06-01 | 3 | -5/+5 | |
* | | | | | | | | | Merge pull request #20409 from davydovanton/doc-queue-adapter | Abdelkader Boudih | 2015-06-02 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [skip ci] Add documentation for QueueAdapter::queue_adapter | Anton Davydov | 2015-06-02 | 1 | -0/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20357 from ronakjangir47/remove_mocha1 | Rafael Mendonça França | 2015-06-01 | 1 | -27/+52 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Removed use of mocha from railties actions_test | Ronak Jangir | 2015-06-01 | 1 | -27/+52 | |
* | | | | | | | | | | Merge pull request #20406 from yoongkang/add_edge_sprockets | Santiago Pastorino | 2015-06-01 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use sprockets-rails from github repo | Yoong Kang Lim | 2015-06-02 | 1 | -0/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #20405 from manish-shrivastava/master | Rafael Mendonça França | 2015-06-01 | 5 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed typos in guide | manish-shrivastava | 2015-06-01 | 5 | -5/+7 | |
* | | | | | | | | | | | Merge pull request #19094 from phoet/have_bearer_be_valid_as_well | Rafael Mendonça França | 2015-06-01 | 3 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | add changelog entry | phoet | 2015-06-01 | 1 | -0/+10 | |
| * | | | | | | | | | | | allow `Bearer` as well as `Token` | phoet | 2015-06-01 | 2 | -1/+8 | |
| * | | | | | | | | | | | actually test what the name says | phoet | 2015-06-01 | 1 | -1/+1 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #20362 from kddeisz/enumerable_pluck | Rafael Mendonça França | 2015-06-01 | 4 | -2/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Allow Enumerable#pluck to take a splat. | Kevin Deisz | 2015-05-29 | 4 | -2/+43 | |
* | | | | | | | | | | | Merge pull request #20138 from tgxworld/deprecated_assert_template | Rafael Mendonça França | 2015-06-01 | 26 | -880/+166 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove `assigns` and `assert_template`. | Guo Xiang Tan | 2015-05-30 | 26 | -880/+166 | |
* | | | | | | | | | | | | Merge pull request #20284 from kaspth/fix-caching-test | Rafael Mendonça França | 2015-06-01 | 3 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Replace expectation with state check. | Kasper Timm Hansen | 2015-05-30 | 3 | -3/+9 | |
* | | | | | | | | | | | | | Merge pull request #20398 from nkondratyev/fix-time-change | Rafael Mendonça França | 2015-06-01 | 3 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix a range of values for parameters of the Time#change | Nikolay Kondratyev | 2015-06-01 | 3 | -1/+9 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #20386 from yoongkang/circular_import | Rafael Mendonça França | 2015-06-01 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix circular import warning on build | Yoong Kang Lim | 2015-05-31 | 1 | -1/+0 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_oracle | Rafael Mendonça França | 2015-06-01 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle | Yasuo Honda | 2015-06-01 | 2 | -2/+6 | |
* | | | | | | | | | | | | | | Merge pull request #20403 from takiy33/patch-1 | Rafael Mendonça França | 2015-06-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Use --no-document option instead of --no-rdoc and --no-ri option | takiy33 | 2015-06-01 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #20371 from davydovanton/doc-adapter-lookup | Yves Senn | 2015-06-01 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [skip ci] Update documentation for QueueAdapters::lookup | Anton Davydov | 2015-06-01 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | Merge pull request #20394 from mechanicles/use-sym | Matthew Draper | 2015-06-01 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | [ci skip] Used 'instance_variables' in example for consistency. | Santosh Wadghule | 2015-06-01 | 1 | -2/+5 | |
* | | | | | | | | | | | | | | Merge pull request #20396 from nkondratyev/fix-guides | Kasper Timm Hansen | 2015-06-01 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Remove description of `dependency_loading` option | Nikolay Kondratyev | 2015-06-01 | 1 | -2/+0 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #20393 from yui-knk/fix/guide2 | Arun Agrawal | 2015-06-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [ci skip] Fix `above` -> `below` | yui-knk | 2015-06-01 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #20392 from equiamos/equiamos-fix-typos-docs | Zachary Scott | 2015-05-31 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fixed typos. [ci skip] | Morgan Owens | 2015-05-31 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | Use `any?` rather than `present?` to check args | eileencodes | 2015-05-31 | 2 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | no rails command short-cuts in the getting-started guide. [ci skip] | Yves Senn | 2015-05-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | minor formatting changes in changelogs. [ci skip] | Yves Senn | 2015-05-31 | 2 | -7/+7 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Attempt to fix travis failures | Sean Griffin | 2015-05-30 | 1 | -0/+3 | |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | |