Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20443 from teoljungberg/thoughtbot-capitalization | Kasper Timm Hansen | 2015-06-05 | 1 | -1/+1 |
|\ | |||||
| * | Fix `thoughtbot` capitalization | Teo Ljungberg | 2015-06-05 | 1 | -1/+1 |
* | | Merge pull request #20429 from repinel/improve-bug-report-template | Rafael Mendonça França | 2015-06-04 | 3 | -33/+18 |
|\ \ | |||||
| * | | Use inline Gemfile dependency when reporting bugs | Roque Pinel | 2015-06-03 | 3 | -33/+18 |
* | | | Merge pull request #20439 from jimmycuadra/require-as-duration | Arthur Nogueira Neves | 2015-06-04 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Require active_support/duration. | Jimmy Cuadra | 2015-06-04 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #20427 from ronakjangir47/http_path | Yves Senn | 2015-06-04 | 1 | -9/+0 |
|\ \ \ | |||||
| * | | | Removed duplicate test cases for template execution | Ronak Jangir | 2015-06-04 | 1 | -9/+0 |
| |/ / | |||||
* | | | Merge pull request #20430 from georgeclaghorn/tighten-up-suppression | Rafael Mendonça França | 2015-06-04 | 2 | -3/+33 |
|\ \ \ | |/ / |/| | | |||||
| * | | Apply Active Record suppression to all saves | George Claghorn | 2015-06-04 | 2 | -3/+33 |
|/ / | |||||
* | | Document config.action_mailer.deliver_later_queue_name | Rafael Mendonça França | 2015-06-03 | 2 | -0/+7 |
* | | Merge pull request #18587 from chrismcg/allow_deliver_later_queue_name_to_be_... | Rafael Mendonça França | 2015-06-03 | 5 | -1/+33 |
|\ \ | |||||
| * | | Allow configuration of ActionMailer queue name | Chris McGrath | 2015-06-02 | 5 | -1/+33 |
* | | | pass check_ip and proxies to GetIp constructor | Aaron Patterson | 2015-06-03 | 1 | -4/+4 |
* | | | Merge pull request #20421 from repinel/fix-clear-guides-and-related-api-docs | Rafael Mendonça França | 2015-06-03 | 2 | -8/+15 |
|\ \ \ | |||||
| * | | | [ci skip] fix the `collection.clear` guide | Roque Pinel | 2015-06-02 | 2 | -8/+15 |
|/ / / | |||||
* | | | Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug" | Rafael Mendonça França | 2015-06-02 | 2 | -31/+8 |
* | | | Merge pull request #20383 from jonatack/fix-configurable-static-index-filename | Santiago Pastorino | 2015-06-02 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | 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 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | |