Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Give credit to extra contributor for Base.reload fix | Shane Hender | 2015-05-28 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20196 from huoxito/preload-association-and-merges | Rafael Mendonça França | 2015-05-28 | 2 | -2/+50 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Properly append preload / includes args on Merger | Washington Luiz | 2015-05-28 | 2 | -2/+50 | |
* | | | | | | | Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionview | Rafael Mendonça França | 2015-05-28 | 1 | -21/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove custom `lines` and use `/tools/line_statistics` | Arun Agrawal | 2015-05-22 | 1 | -21/+3 | |
* | | | | | | | | Merge pull request #20041 from akshay-vishnoi/sqlite_collation | Rafael Mendonça França | 2015-05-28 | 6 | -9/+139 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add collation support for string and text columns in SQLite3 | Akshay Vishnoi | 2015-05-28 | 6 | -9/+139 | |
* | | | | | | | | | Add test to 57daaef | Rafael Mendonça França | 2015-05-28 | 1 | -1/+1 | |
* | | | | | | | | | Allow Relation#compact using delegation | Jordan Raine | 2015-05-28 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20329 from EduardoBautista/json-api-support | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add application/vnd.api+json alias to the JSON MIME Type. | Eduardo Bautista | 2015-05-27 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #20171 from georgeclaghorn/enums-in-fixtures | Rafael Mendonça França | 2015-05-27 | 6 | -32/+64 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Resolve enums in test fixtures | George Claghorn | 2015-05-27 | 6 | -32/+64 | |
* | | | | | | | | | Merge pull request #19886 from henders/henders/reload_wipe_query_cache | Rafael Mendonça França | 2015-05-27 | 3 | -1/+34 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Cause ActiveRecord::Base::reload to also ignore the QueryCache. | Shane Hender | 2015-04-28 | 2 | -1/+30 | |
* | | | | | | | | | | Merge pull request #17654 from kamipo/strict_mode_explicitly | Rafael Mendonça França | 2015-05-27 | 3 | -2/+22 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | If specify `strict: :default` explicitly, do not set sql_mode. | Ryuta Kamizono | 2015-05-26 | 3 | -2/+22 | |
* | | | | | | | | | | Merge pull request #20269 from wojobucco/master | Rafael Mendonça França | 2015-05-27 | 3 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Changed mysqldump to include sprocs and functions | Jonathan Worek | 2015-05-22 | 2 | -4/+5 | |
* | | | | | | | | | | | Merge pull request #20326 from hderms/dh/fix_task_bug | Rafael Mendonça França | 2015-05-27 | 2 | -16/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | add fixed file | Dermot Haughey | 2015-05-27 | 2 | -16/+66 | |
* | | | | | | | | | | | | :bomb: Fix another leftover | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | Fix file name | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #19808 from byroot/action-parameter | Rafael Mendonça França | 2015-05-27 | 2 | -15/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Allow to parameters named `action` or `controller` from AC::TestCase helpers | Jean Boussier | 2015-04-18 | 2 | -15/+32 | |
* | | | | | | | | | | | | | Merge pull request #19867 from radar/rename-app-rails-loader | Rafael Mendonça França | 2015-05-27 | 4 | -14/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove redundant 'Rails' from Rails::AppRailsLoader constant | Ryan Bigg | 2015-05-21 | 4 | -14/+14 | |
* | | | | | | | | | | | | | | Merge pull request #20327 from yoongkang/ajax | Zachary Scott | 2015-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | [ci skip] Replace dead link about HttpOnly cookies. | Yoong Kang Lim | 2015-05-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge pull request #20316 from vngrs/add_assertion_for_get_method_into_reques... | Rafael Mendonça França | 2015-05-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add assertion for get? method into test cases | Mehmet Emin İNAÇ | 2015-05-27 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #20321 from vngrs/fix_indentation_warning | Rafael Mendonça França | 2015-05-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix indentation warning on active_support ordered_options | Mehmet Emin İNAÇ | 2015-05-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge pull request #20323 from jakegavin/initialization-guide-update | Claudio B. | 2015-05-27 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove unnecessary reference to example Blog app [ci skip] | Jake Gavin | 2015-05-27 | 1 | -3/+2 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #20319 from kassio/master | Rafael Mendonça França | 2015-05-27 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove web-console and spring from test group on default Gemfile. | Kassio Borges | 2015-05-27 | 1 | -2/+4 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #20314 from vngrs/add_doc_about_form_data_method | Santiago Pastorino | 2015-05-27 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Documentation for ActionDispatch::Request form_data? method [ci skip] | Mehmet Emin İNAÇ | 2015-05-27 | 1 | -0/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-task | Yves Senn | 2015-05-27 | 8 | -60/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove broken and unused release task | Arun Agrawal | 2015-05-22 | 8 | -60/+0 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #20297 from gouravtiwari/patch-9 | Claudio B. | 2015-05-26 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Added multibyte slice! example to doc [ci skip] | Gourav Tiwari | 2015-05-26 | 1 | -0/+6 | |
* | | | | | | | | | | | | | Merge pull request #20310 from guigs/patch-1 | Rafael Mendonça França | 2015-05-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix email with name format in Guides. [ci skip] | Guilherme Goettems Schneider | 2015-05-26 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #20208 from gaurish/raise_on_missing_ordered_options | Rafael Mendonça França | 2015-05-26 | 3 | -1/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add bang version to OrderedOptions | Gaurish Sharma | 2015-05-23 | 3 | -1/+36 | |
* | | | | | | | | | | | | | | Merge pull request #20305 from vngrs/missing_docs_and_no_docs_for_action_disp... | Rafael Mendonça França | 2015-05-26 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip] | Mehmet Emin İNAÇ | 2015-05-26 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | Merge pull request #20309 from stephen-puiszis/patch-1 | Rafael Mendonça França | 2015-05-26 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |